--- ray/src/px/x11raster.c 2003/02/22 02:07:28 2.10 +++ ray/src/px/x11raster.c 2003/07/27 22:12:03 2.12 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: x11raster.c,v 2.10 2003/02/22 02:07:28 greg Exp $"; +static const char RCSid[] = "$Id: x11raster.c,v 2.12 2003/07/27 22:12:03 schorsch Exp $"; #endif /* * x11raster.c - routines to handle images for X windows. @@ -64,7 +64,7 @@ BYTE cmap[][3]; register unsigned char *p; register int i; - if (xr->image->depth > 8 | xr->ncolors != 0) + if ((xr->image->depth > 8) | (xr->ncolors != 0)) return(xr->ncolors); xr->pmap = (short *)malloc(256*sizeof(short)); if (xr->pmap == NULL) @@ -85,7 +85,7 @@ BYTE cmap[][3]; xr->cdefs[xr->ncolors].flags = DoRed|DoGreen|DoBlue; xr->pmap[*p] = xr->ncolors++; } - xr->cdefs = (XColor *)realloc((char *)xr->cdefs, + xr->cdefs = (XColor *)realloc((void *)xr->cdefs, xr->ncolors*sizeof(XColor)); if (xr->cdefs == NULL) return(0);