ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/px/x11image.c
(Generate patch)

Comparing ray/src/px/x11image.c (file contents):
Revision 2.59 by greg, Fri Jun 20 00:25:50 2003 UTC vs.
Revision 2.63 by schorsch, Mon Jul 21 22:30:19 2003 UTC

# Line 18 | Line 18 | static const char RCSid[] = "$Id";
18  
19   #include  "standard.h"
20  
21 + #include  <string.h>
22   #include  <signal.h>
23   #include  <X11/Xlib.h>
24   #include  <X11/cursorfont.h>
# Line 493 | Line 494 | static char  vistype[][12] = {
494          if (viscmp(&xvi[i],&ourvis) > 0)
495                  quiterr("inadequate visuals on this screen");
496                                          /* OK, we'll use it */
497 <        copystruct(&ourvis, &xvi[i]);
497 >        ourvis = xvi[i];
498   #ifdef DEBUG
499          fprintf(stderr, "Selected visual type %s, depth %d\n",
500                          vistype[ourvis.class], ourvis.depth);
# Line 625 | Line 626 | getevent()                             /* process the next event */
626   traceray(xpos, ypos)                    /* print requested pixel data */
627   int  xpos, ypos;
628   {
629 <        FLOAT  hv[2];
629 >        RREAL  hv[2];
630          FVECT  rorg, rdir;
631          COLOR  cval;
632          register char  *cp;
# Line 673 | Line 674 | XKeyPressedEvent  *ekey;
674          XColor  cvx;
675          int  com, n;
676          double  comp;
677 <        FLOAT  hv[2];
677 >        RREAL  hv[2];
678  
679          n = XLookupString(ekey, buf, sizeof(buf), NULL, NULL);
680          if (n == 0)
# Line 891 | Line 892 | int  x0, y0, x1, y1;
892   }
893  
894  
895 < int
895 > void
896   colavg(scn, n, cavg)
897   register COLR   *scn;
898   register int    n;
# Line 925 | Line 926 | COLOR  cavg;
926  
927   int
928   dobox(f, p)                             /* run function over bbox */
929 < int     (*f)();                 /* function to call for each subscan */
929 > void    (*f)();                 /* function to call for each subscan */
930   char    *p;                     /* pointer to private data */
931   {
932          int  left, right, top, bottom;
# Line 956 | Line 957 | char   *p;                     /* pointer to private data */
957   }
958  
959  
960 < int
960 > void
961   addfix(scn, n)                  /* add fixation points to histogram */
962   COLR    *scn;
963   int     n;
# Line 1309 | Line 1310 | int  y;
1310          static int  trunced = -1;               /* truncated file? */
1311   skipit:
1312          if (trunced >= 0 && y >= trunced) {
1313 <                bzero(scanline, xmax*sizeof(COLR));
1313 >                memset(scanline, '\0', xmax*sizeof(COLR));
1314                  return(-1);
1315          }
1316          if (y != cury) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines