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

Comparing ray/src/px/ximage.c (file contents):
Revision 2.9 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.13 by schorsch, Fri Jan 2 12:47:01 2004 UTC

# Line 15 | Line 15 | static const char      RCSid[] = "$Id$";
15   #include  <X/cursors/bcross_mask.cursor>
16  
17   #include  <sys/types.h>
18 <
18 > #include  <string.h>
19   #include  <ctype.h>
20 –
20   #include  <time.h>
21  
22   #include  "color.h"
24 –
23   #include  "resolu.h"
26 –
24   #include  "xraster.h"
28 –
25   #include  "view.h"
30 –
26   #include  "pic.h"
32 –
27   #include  "random.h"
28  
29   #define  controlshift(e)        (((XButtonEvent *)(e))->detail & (ShiftMask|ControlMask))
# Line 85 | Line 79 | char  *progname;
79  
80   char  errmsg[128];
81  
82 + static gethfunc headline;
83  
84 +
85   main(argc, argv)
86   int  argc;
87   char  *argv[];
88   {
89          extern char  *getenv();
90          char  *gv;
95 –        int  headline();
91          int  i;
92          
93          progname = argv[0];
# Line 164 | Line 159 | userr:
159   }
160  
161  
162 < int
163 < headline(s)             /* get relevant info from header */
164 < char  *s;
162 > static int
163 > headline(               /* get relevant info from header */
164 >        char    *s,
165 >        void    *p
166 > )
167   {
168          char  fmt[32];
169  
# Line 597 | Line 594 | colormap       cmap;
594                          xr->cdefs[xr->ncolors].pixel = *p;
595                          xr->pmap[*p] = xr->ncolors++;
596                  }
597 <        xr->cdefs = (Color *)realloc((char *)xr->cdefs, xr->ncolors*sizeof(Color));
597 >        xr->cdefs = (Color *)realloc((void *)xr->cdefs, xr->ncolors*sizeof(Color));
598          if (xr->cdefs == NULL)
599                  return(0);
600          return(1);
# Line 674 | Line 671 | picwriteline(y, l)             /* add 8-bit scanline to image */
671   int  y;
672   pixel  *l;
673   {
674 <        bcopy((char *)l, (char *)ourras->data.bz+BZPixmapSize(xmax,y), BZPixmapSize(xmax,1));
674 >        memcpy((void *)ourras->data.bz+BZPixmapSize(xmax,y), (void *)l, BZPixmapSize(xmax,1));
675   }
676  
677  

Diff Legend

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