--- ray/src/px/ciq.c 1991/11/12 16:04:10 2.1 +++ ray/src/px/ciq.c 2003/05/13 17:58:33 2.3 @@ -1,9 +1,6 @@ -/* Copyright 1988 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: ciq.c,v 2.3 2003/05/13 17:58:33 greg Exp $"; #endif - /* CIQ - main program for color image quantization options for Floyd-Steinberg dithering by minimization of accumulated error @@ -44,7 +41,7 @@ colormap cm; /* quantization colormap */ if (synth) n = makecm(nw,&na); /* analyze histogram and synthesize colormap */ else { - bcopy((char *)cm,(char *)color,sizeof color); + bcopy((void *)cm,(void *)color,sizeof color); n = nw; na = 0; for (i=0; ir,lp->g,lp->b)++; } - free((char *)line); + free((void *)line); } convertmap(in,out) /* convert to shifted color map */ @@ -120,8 +117,8 @@ colormap ocm; /* colormap for orig */ oline[x] = table(map,lp->r,lp->g,lp->b); picwriteline(y,oline); } - free((char *)iline); - free((char *)oline); + free((void *)iline); + free((void *)oline); } draw_dith(ocm) /* quantize with dithering */ @@ -170,7 +167,7 @@ colormap ocm; /* colormap for orig */ } picwriteline(y,oline); } - free((char *)iline); - free((char *)oline); - free((char *)buf); + free((void *)iline); + free((void *)oline); + free((void *)buf); }