--- ray/src/rt/colortab.c	1990/03/29 12:43:07	1.14
+++ ray/src/rt/colortab.c	2004/03/30 16:13:01	2.9
@@ -1,9 +1,6 @@
-/* Copyright (c) 1989 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: colortab.c,v 2.9 2004/03/30 16:13:01 schorsch Exp $";
 #endif
-
 /*
  * colortab.c - allocate and control dynamic color table.
  *
@@ -14,11 +11,18 @@ static char SCCSid[] = "$SunId$ LBL";
  *	histogram is cleared.  This algorithm
  *	performs only as well as the next drawing's color
  *	distribution is correlated to the last.
+ *
+ *  External symbols declared in drvier.h
  */
 
+#include "copyright.h"
+
+#include <string.h>
+
+#include "standard.h"
 #include "color.h"
+#include "driver.h"
 
-#define NULL		0
 				/* histogram resolution */
 #define NRED		24
 #define NGRN		32
@@ -33,7 +37,7 @@ static char SCCSid[] = "$SunId$ LBL";
 				(int)(colval(c,p)*256.) : 255 ]
 				/* color partition tree */
 #define CNODE		short
-#define set_branch(p,c)	((c)<<2|(p))
+#define set_branch(p,c) ((c)<<2|(p))
 #define set_pval(pv)	((pv)<<2|3)
 #define is_branch(cn)	(((cn)&3)!=3)
 #define is_pval(cn)	(((cn)&3)==3)
@@ -43,8 +47,8 @@ static char SCCSid[] = "$SunId$ LBL";
 				/* our color table */
 static struct tabent {
 	long	sum[3];		/* sum of colors using this entry */
-	long	n;		/* number of colors */
-	short	ent[3];		/* current table value */
+	int	n;		/* number of colors */
+	BYTE	ent[3];		/* current table value */
 }	*clrtab = NULL;
 				/* color cube partition */
 static CNODE	*ctree = NULL;
@@ -53,9 +57,12 @@ static BYTE	clrmap[3][256];
 				/* histogram of colors used */
 static unsigned short	histo[NRED][NGRN][NBLU];
 				/* initial color cube boundary */
-static int	CLRCUBE[3][2] = {0,NRED,0,NGRN,0,NBLU};
+static int	CLRCUBE[3][2] = {{0,NRED},{0,NGRN},{0,NBLU}};
 
+static int	split();
+static void	cut();
 
+
 int
 new_ctab(ncolors)		/* start new color table with max ncolors */
 int	ncolors;
@@ -66,9 +73,9 @@ int	ncolors;
 		return(0);
 				/* free old tables */
 	if (clrtab != NULL)
-		free((char *)clrtab);
+		free((void *)clrtab);
 	if (ctree != NULL)
-		free((char *)ctree);
+		free((void *)ctree);
 				/* get new tables */
 	for (treesize = 1; treesize < ncolors; treesize <<= 1)
 		;
@@ -80,18 +87,18 @@ int	ncolors;
 				/* partition color space */
 	cut(ctree, 0, CLRCUBE, 0, ncolors);
 				/* clear histogram */
-	bzero((char *)histo, sizeof(histo));
+	memset((void *)histo, '\0', sizeof(histo));
 				/* return number of colors used */
 	return(ncolors);
 }
 
 
-int
-get_pixel(col, set_pixel)	/* get pixel for color */
-COLOR	col;
-int	(*set_pixel)();
+extern int
+get_pixel(	/* get pixel for color */
+	COLOR	col,
+	dr_newcolrf_t *newcolr
+)
 {
-	extern char	errmsg[];
 	int	r, g, b;
 	int	cv[3];
 	register CNODE	*tp;
@@ -111,7 +118,7 @@ int	(*set_pixel)();
 		if (cv[prim(*tp)] < part(*tp))
 			tp += 1<<h;		/* left branch */
 		else
-			tp += 1<<(h+1);	/* right branch */
+			tp += 1<<(h+1);		/* right branch */
 	h = pval(*tp);
 						/* add to color table */
 	clrtab[h].sum[RED] += r;
@@ -128,41 +135,43 @@ int	(*set_pixel)();
 			(g-clrtab[h].ent[GRN])*(g-clrtab[h].ent[GRN]) +
 			(b-clrtab[h].ent[BLU])*(b-clrtab[h].ent[BLU]) > MAXDST2) {
 		clrtab[h].ent[RED] = r;
-		clrtab[h].ent[GRN] = g;	/* reassign pixel */
+		clrtab[h].ent[GRN] = g; /* reassign pixel */
 		clrtab[h].ent[BLU] = b;
 #ifdef DEBUG
 		sprintf(errmsg, "pixel %d = (%d,%d,%d) (%d refs)\n",
 				h, r, g, b, clrtab[h].n);
 		eputs(errmsg);
 #endif
-		(*set_pixel)(h, r, g, b);
+		(*newcolr)(h, r, g, b);
 	}
 	return(h);				/* return pixel value */
 }
 
 
+void
 make_gmap(gam)			/* make gamma correction map */
-double  gam;
+double	gam;
 {
-	extern double	pow();
 	register int	i;
 	
 	for (i = 0; i < 256; i++)
 		clrmap[RED][i] =
 		clrmap[GRN][i] =
-		clrmap[BLU][i] = 256.0 * pow(i/256.0, 1.0/gam);
+		clrmap[BLU][i] = 256.0 * pow((i+0.5)/256.0, 1.0/gam);
 }
 
 
+void
 set_cmap(rmap, gmap, bmap)	/* set custom color correction map */
 BYTE	*rmap, *gmap, *bmap;
 {
-	bcopy((char *)rmap, (char *)clrmap[RED], 256);
-	bcopy((char *)gmap, (char *)clrmap[GRN], 256);
-	bcopy((char *)bmap, (char *)clrmap[BLU], 256);
+	memcpy((void *)clrmap[RED], (void *)rmap, 256);
+	memcpy((void *)clrmap[GRN], (void *)gmap, 256);
+	memcpy((void *)clrmap[BLU], (void *)bmap, 256);
 }
 
 
+void
 map_color(rgb, col)		/* map a color to a byte triplet */
 BYTE	rgb[3];
 COLOR	col;
@@ -173,7 +182,7 @@ COLOR	col;
 }
 
 
-static
+static void
 cut(tree, level, box, c0, c1)		/* partition color space */
 register CNODE	*tree;
 int	level;
@@ -188,7 +197,7 @@ int	c0, c1;
 	}
 					/* split box */
 	*tree = split(box);
-	bcopy((char *)box, (char *)kb, sizeof(kb));
+	memcpy((void *)kb, (void *)box, sizeof(kb));
 						/* do left (lesser) branch */
 	kb[prim(*tree)][1] = part(*tree);
 	cut(tree+(1<<level), level+1, kb, c0, (c0+c1)>>1);
@@ -206,7 +215,7 @@ register int	box[3][2];
 #define c0	r
 	register int	r, g, b;
 	int	pri;
-	int	t[HMAX], med;
+	long	t[HMAX], med;
 					/* find dominant axis */
 	pri = RED;
 	if (box[GRN][1]-box[GRN][0] > box[pri][1]-box[pri][0])