--- ray/src/rt/colortab.c	1990/01/19 00:00:37	1.11
+++ ray/src/rt/colortab.c	1991/11/12 17:09:57	2.1
@@ -16,9 +16,9 @@ static char SCCSid[] = "$SunId$ LBL";
  *	distribution is correlated to the last.
  */
 
-#include "color.h"
+#include "standard.h"
 
-#define NULL		0
+#include "color.h"
 				/* histogram resolution */
 #define NRED		24
 #define NGRN		32
@@ -43,8 +43,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;
@@ -91,6 +91,7 @@ get_pixel(col, set_pixel)	/* get pixel for color */
 COLOR	col;
 int	(*set_pixel)();
 {
+	extern char	errmsg[];
 	int	r, g, b;
 	int	cv[3];
 	register CNODE	*tp;
@@ -110,7 +111,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;
@@ -129,9 +130,10 @@ int	(*set_pixel)();
 		clrtab[h].ent[RED] = r;
 		clrtab[h].ent[GRN] = g;	/* reassign pixel */
 		clrtab[h].ent[BLU] = b;
-#ifdef notdef
-		printf("pixel %d = (%d,%d,%d) (%d refs)\n",
+#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);
 	}
@@ -148,7 +150,7 @@ double  gam;
 	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);
 }
 
 
@@ -158,6 +160,16 @@ 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);
+}
+
+
+map_color(rgb, col)		/* map a color to a byte triplet */
+BYTE	rgb[3];
+COLOR	col;
+{
+	rgb[RED] = map_col(col,RED);
+	rgb[GRN] = map_col(col,GRN);
+	rgb[BLU] = map_col(col,BLU);
 }