--- ray/src/px/neuclrtab.c 1994/11/22 12:19:21 2.7 +++ ray/src/px/neuclrtab.c 2003/06/30 14:59:12 2.10 @@ -1,17 +1,16 @@ -/* Copyright (c) 1994 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: neuclrtab.c,v 2.10 2003/06/30 14:59:12 schorsch Exp $"; #endif - /* * Neural-Net quantization algorithm based on work of Anthony Dekker */ -#include "standard.h" +#include "copyright.h" -#include "color.h" +#include +#include "standard.h" +#include "color.h" #include "random.h" #ifdef COMPAT_MODE @@ -51,7 +50,9 @@ static long skipcount; #define setskip(sp,n) ((sp)[0]=(n)>>16,(sp)[1]=((n)>>8)&255,(sp)[2]=(n)&255) +static cpyclrtab(); + neu_init(npixels) /* initialize our sample array */ long npixels; { @@ -132,7 +133,7 @@ int ncolors; cpyclrtab(); inxbuild(); /* we're done with our samples */ - free((char *)thesamples); + free((void *)thesamples); /* reset dithering function */ neu_dith_colrs((BYTE *)NULL, (COLR *)NULL, 0); /* return new color table size */ @@ -172,7 +173,7 @@ int n; if (n != N) { /* get error propogation array */ if (N) { - free((char *)cerr); + free((void *)cerr); cerr = NULL; } if (n) @@ -183,7 +184,7 @@ int n; return; } N = n; - bzero((char *)cerr, 3*N*sizeof(short)); + memset((char *)cerr, '\0', 3*N*sizeof(short)); } err[0] = err[1] = err[2] = 0; for (x = 0; x < n; x++) {