--- ray/src/px/biq.c 1989/02/02 10:49:06 1.1 +++ ray/src/px/biq.c 2003/06/30 14:59:12 2.4 @@ -1,13 +1,15 @@ -/* - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: biq.c,v 2.4 2003/06/30 14:59:12 schorsch Exp $"; #endif +/* * biq.c - simple greyscale quantization. * * 9/19/88 */ +#include + +#include "standard.h" #include "ciq.h" @@ -29,7 +31,7 @@ colormap cm; /* quantization colormap */ draw_grey(ocm); - bcopy(color,cm,sizeof color); + memcpy((void *)cm,(void *)color,sizeof color); } /*----------------------------------------------------------------------*/ @@ -39,6 +41,8 @@ colormap ocm; { register rgbpixel *linin; register pixel *linout; + rgbpixel intmp; + int outtmp; int y; register int x; @@ -48,14 +52,14 @@ colormap ocm; for (y = 0; y < ymax; y++) { picreadline3(y, linin); for (x = 0; x < xmax; x++) { - linin[x].r = ocm[0][linin[x].r]; - linin[x].g = ocm[1][linin[x].g]; - linin[x].b = ocm[2][linin[x].b]; - linout[x] = rgb_bright(&linin[x]); - linout[x] = (linout[x]*n+n/2)/256; + intmp.r = ocm[0][linin[x].r]; + intmp.g = ocm[1][linin[x].g]; + intmp.b = ocm[2][linin[x].b]; + outtmp = rgb_bright(&intmp); + linout[x] = (outtmp*n+n/2)/256; } picwriteline(y, linout); } - free((char *)linin); - free((char *)linout); + free((void *)linin); + free((void *)linout); }