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

Comparing ray/src/px/x11raster.c (file contents):
Revision 2.9 by greg, Wed Nov 23 14:24:32 1994 UTC vs.
Revision 2.11 by greg, Wed Apr 23 00:52:34 2003 UTC

# Line 1 | Line 1
1 – /* Copyright 1990 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * x11raster.c - routines to handle images for X windows.
6   *
# Line 17 | Line 14 | static char SCCSid[] = "$SunId$ LBL";
14   #include "color.h"
15   #include "x11raster.h"
16  
20 – extern char  *malloc(), *realloc(), *calloc();
17  
22 –
18   XRASTER *
19   make_raster(disp, vis, npixbits, data, width, height, bm_pad)
20   Display *disp;
# Line 90 | Line 85 | BYTE   cmap[][3];
85                          xr->cdefs[xr->ncolors].flags = DoRed|DoGreen|DoBlue;
86                          xr->pmap[*p] = xr->ncolors++;
87                  }
88 <        xr->cdefs = (XColor *)realloc((char *)xr->cdefs,
88 >        xr->cdefs = (XColor *)realloc((void *)xr->cdefs,
89                          xr->ncolors*sizeof(XColor));
90          if (xr->cdefs == NULL)
91                  return(0);
# Line 136 | Line 131 | Visual *vis;
131                  i--;
132          }
133          XFreeColors(disp, cmap, pixels, n, 0);
134 <        free((char *)pixels);
134 >        free((void *)pixels);
135          return(cmap);
136   }
137  
# Line 165 | Line 160 | Window w;
160                  if (xr->cmap == DefaultColormap(xr->disp, xr->screen))
161                          xr->cmap = newcmap(xr->disp, xr->screen, xr->visual);
162                  else {
163 <                        free((char *)xr->pixels);
163 >                        free((void *)xr->pixels);
164                          xr->pixels = NULL;
165                          return(NULL);
166                  }
# Line 257 | Line 252 | register XRASTER       *xr;
252          XFreeColors(xr->disp, xr->cmap, xr->pixels, xr->ncolors, 0);
253          if (xr->cmap != DefaultColormap(xr->disp, xr->screen))
254                  XFreeColormap(xr->disp, xr->cmap);
255 <        free((char *)xr->pixels);
255 >        free((void *)xr->pixels);
256          xr->pixels = NULL;
257   }
258  
# Line 278 | Line 273 | register XRASTER       *xr;
273          free_rpixmap(xr);
274          if (xr->ncolors > 0) {
275                  unmap_rcolors(xr);
276 <                free((char *)xr->pmap);
277 <                free((char *)xr->cdefs);
276 >                free((void *)xr->pmap);
277 >                free((void *)xr->cdefs);
278          }
279          XDestroyImage(xr->image);
280          if (xr->gc != 0)
281                  XFreeGC(xr->disp, xr->gc);
282 <        free((char *)xr);
282 >        free((void *)xr);
283   }

Diff Legend

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