--- ray/src/rt/colortab.c	1989/10/03 11:10:10	1.3
+++ ray/src/rt/colortab.c	1989/10/16 13:43:26	1.9
@@ -27,53 +27,58 @@ static char SCCSid[] = "$SunId$ LBL";
 				/* minimum box count for adaptive partition */
 #define MINSAMP		7
 				/* maximum distance^2 before color reassign */
-#define MAXDST2		5
-				/* maximum frame buffer depth */
-#define FBDEPTH		8
-				/* color map resolution */
-#define MAPSIZ		256
+#define MAXDST2		12
 				/* map a color */
-#define map_col(c,p)	clrmap[ colval(c,p)<1. ? \
-				(int)(colval(c,p)*MAPSIZ) : MAPSIZ-1 ]
+#define map_col(c,p)	clrmap[p][ colval(c,p)<1. ? \
+				(int)(colval(c,p)*256.) : 255 ]
 				/* color partition tree */
 #define CNODE		short
 #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)
 #define part(cn)	((cn)>>2)
 #define prim(cn)	((cn)&3)
 #define pval(cn)	((cn)>>2)
 				/* our color table */
-struct tabent {
+static struct tabent {
 	long	sum[3];		/* sum of colors using this entry */
 	long	n;		/* number of colors */
 	short	ent[3];		/* current table value */
-}	clrtab[1<<FBDEPTH];
+}	*clrtab = NULL;
+				/* color cube partition */
+static CNODE	*ctree = NULL;
 				/* our color correction map */
-static BYTE	clrmap[MAPSIZ];
+static BYTE	clrmap[3][256];
 				/* histogram of colors used */
-static unsigned	histo[NRED][NGRN][NBLU];
-				/* initial color cube boundaries */
+static unsigned short	histo[NRED][NGRN][NBLU];
+				/* initial color cube boundary */
 static int	CLRCUBE[3][2] = {0,NRED,0,NGRN,0,NBLU};
-				/* color cube partition */
-static CNODE	ctree[1<<(FBDEPTH+1)];
-				/* callback for pixel assignment */
-static int	(*set_pixel)();
 
 
 int
-new_ctab(ncolors, cset)		/* start new color table with max ncolors */
+new_ctab(ncolors)		/* start new color table with max ncolors */
 int	ncolors;
-int	(*cset)();
 {
-	if (ncolors < 1 || ncolors > 1<<FBDEPTH || cset == NULL)
+	int	treesize;
+
+	if (ncolors < 1)
 		return(0);
-				/* assign pixel callback routine */
-	set_pixel = cset;
-				/* clear color table */
-	bzero(clrtab, sizeof(clrtab));
+				/* free old tables */
+	if (clrtab != NULL)
+		free((char *)clrtab);
+	if (ctree != NULL)
+		free((char *)ctree);
+				/* get new tables */
+	for (treesize = 1; treesize < ncolors; treesize <<= 1)
+		;
+	treesize <<= 1;
+	clrtab = (struct tabent *)calloc(ncolors, sizeof(struct tabent));
+	ctree = (CNODE *)malloc(treesize*sizeof(CNODE));
+	if (clrtab == NULL || ctree == NULL)
+		return(0);
 				/* partition color space */
-	cut(ctree, FBDEPTH, CLRCUBE, 0, ncolors);
+	cut(ctree, 0, CLRCUBE, 0, ncolors);
 				/* clear histogram */
 	bzero(histo, sizeof(histo));
 				/* return number of colors used */
@@ -82,8 +87,9 @@ int	(*cset)();
 
 
 int
-get_pixel(col)			/* get pixel for color */
+get_pixel(col, set_pixel)	/* get pixel for color */
 COLOR	col;
+int	(*set_pixel)();
 {
 	int	r, g, b;
 	int	cv[3];
@@ -100,15 +106,11 @@ COLOR	col;
 						/* add to histogram */
 	histo[cv[RED]][cv[GRN]][cv[BLU]]++;
 						/* find pixel in tree */
-	p.t = ctree;
-	for (h = FBDEPTH; h > 0; h--) {
-		if (is_pval(*p.t))
-			break;
+	for (p.t = ctree, h = 0; is_branch(*p.t); h++)
 		if (cv[prim(*p.t)] < part(*p.t))
-			p.t++;		/* left branch */
+			p.t += 1<<h;		/* left branch */
 		else
-			p.t += 1<<h;	/* right branch */
-	}
+			p.t += 1<<(h+1);	/* right branch */
 	h = pval(*p.t);
 						/* add to color table */
 	p.e = clrtab + h;
@@ -139,21 +141,32 @@ COLOR	col;
 }
 
 
-make_cmap(gam)			/* make gamma correction map */
+make_gmap(gam)			/* make gamma correction map */
 double  gam;
 {
 	extern double	pow();
 	register int	i;
 	
-	for (i = 0; i < MAPSIZ; i++)
-		clrmap[i] = 256.0 * pow(i/(double)MAPSIZ, 1.0/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);
 }
 
 
+set_cmap(rmap, gmap, bmap)	/* set custom color correction map */
+BYTE	*rmap, *gmap, *bmap;
+{
+	bcopy(rmap, clrmap[RED], 256);
+	bcopy(gmap, clrmap[GRN], 256);
+	bcopy(bmap, clrmap[BLU], 256);
+}
+
+
 static
-cut(tree, height, box, c0, c1)		/* partition color space */
+cut(tree, level, box, c0, c1)		/* partition color space */
 register CNODE	*tree;
-int	height;
+int	level;
 register int	box[3][2];
 int	c0, c1;
 {
@@ -168,11 +181,11 @@ int	c0, c1;
 	bcopy(box, kb, sizeof(kb));
 						/* do left (lesser) branch */
 	kb[prim(*tree)][1] = part(*tree);
-	cut(tree+1, height-1, kb, c0, (c0+c1)>>1);
+	cut(tree+(1<<level), level+1, kb, c0, (c0+c1)>>1);
 						/* do right branch */
 	kb[prim(*tree)][0] = part(*tree);
 	kb[prim(*tree)][1] = box[prim(*tree)][1];
-	cut(tree+(1<<height), height-1, kb, (c0+c1)>>1, c1);
+	cut(tree+(1<<(level+1)), level+1, kb, (c0+c1)>>1, c1);
 }