--- ray/src/rt/colortab.c	1989/10/03 11:10:10	1.3
+++ ray/src/rt/colortab.c	1993/05/05 10:18:47	2.4
@@ -1,4 +1,4 @@
-/* Copyright (c) 1989 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -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
@@ -27,67 +27,76 @@ 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_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];
+	int	n;		/* number of colors */
+	BYTE	ent[3];		/* current table value */
+}	*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 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)();
+static unsigned short	histo[NRED][NGRN][NBLU];
+				/* initial color cube boundary */
+static int	CLRCUBE[3][2] = {{0,NRED},{0,NGRN},{0,NBLU}};
 
+static int	split(), cut();
 
+
 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));
+	bzero((char *)histo, sizeof(histo));
 				/* return number of colors used */
 	return(ncolors);
 }
 
 
 int
-get_pixel(col)			/* get pixel for color */
+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 union { CNODE *t; struct tabent *e; }	p;
+	register CNODE	*tp;
 	register int	h;
 						/* map color */
 	r = map_col(col,RED);
@@ -100,38 +109,33 @@ 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;
-		if (cv[prim(*p.t)] < part(*p.t))
-			p.t++;		/* left branch */
+	for (tp = ctree, h = 0; is_branch(*tp); h++)
+		if (cv[prim(*tp)] < part(*tp))
+			tp += 1<<h;		/* left branch */
 		else
-			p.t += 1<<h;	/* right branch */
-	}
-	h = pval(*p.t);
+			tp += 1<<(h+1);		/* right branch */
+	h = pval(*tp);
 						/* add to color table */
-	p.e = clrtab + h;
-					/* add to sum */
-	p.e->sum[RED] += r;
-	p.e->sum[GRN] += g;
-	p.e->sum[BLU] += b;
-	p.e->n++;
+	clrtab[h].sum[RED] += r;
+	clrtab[h].sum[GRN] += g;
+	clrtab[h].sum[BLU] += b;
+	clrtab[h].n++;
 					/* recompute average */
-	r = p.e->sum[RED] / p.e->n;
-	g = p.e->sum[GRN] / p.e->n;
-	b = p.e->sum[BLU] / p.e->n;
+	r = clrtab[h].sum[RED] / clrtab[h].n;
+	g = clrtab[h].sum[GRN] / clrtab[h].n;
+	b = clrtab[h].sum[BLU] / clrtab[h].n;
 					/* check for movement */
-	if (p.e->n == 1 ||
-			(r-p.e->ent[RED])*(r-p.e->ent[RED]) +
-			(g-p.e->ent[GRN])*(g-p.e->ent[GRN]) +
-			(b-p.e->ent[BLU])*(b-p.e->ent[BLU]) > MAXDST2) {
-		p.e->ent[RED] = r;
-		p.e->ent[GRN] = g;	/* reassign pixel */
-		p.e->ent[BLU] = b;
-#ifdef notdef
-		printf("pixel %d = (%d,%d,%d) (%d refs)\n",
-				h, r, g, b, p.e->n);
+	if (clrtab[h].n == 1 ||
+			(r-clrtab[h].ent[RED])*(r-clrtab[h].ent[RED]) +
+			(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[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);
 	}
@@ -139,21 +143,41 @@ COLOR	col;
 }
 
 
-make_cmap(gam)			/* make gamma correction map */
-double  gam;
+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+0.5)/256.0, 1.0/gam);
 }
 
 
+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);
+}
+
+
+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);
+}
+
+
 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;
 {
@@ -165,14 +189,14 @@ int	c0, c1;
 	}
 					/* split box */
 	*tree = split(box);
-	bcopy(box, kb, sizeof(kb));
+	bcopy((char *)box, (char *)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);
 }
 
 
@@ -183,7 +207,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])