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

Comparing ray/src/px/x11raster.c (file contents):
Revision 2.10 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.12 by schorsch, Sun Jul 27 22:12:03 2003 UTC

# Line 64 | Line 64 | BYTE   cmap[][3];
64          register unsigned char  *p;
65          register int    i;
66  
67 <        if (xr->image->depth > 8 | xr->ncolors != 0)
67 >        if ((xr->image->depth > 8) | (xr->ncolors != 0))
68                  return(xr->ncolors);
69          xr->pmap = (short *)malloc(256*sizeof(short));
70          if (xr->pmap == NULL)
# Line 85 | 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);

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)