--- ray/src/hd/rhd_ctab.c	2003/05/13 17:58:33	3.3
+++ ray/src/hd/rhd_ctab.c	2004/01/01 11:21:55	3.5
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhd_ctab.c,v 3.3 2003/05/13 17:58:33 greg Exp $";
+static const char	RCSid[] = "$Id: rhd_ctab.c,v 3.5 2004/01/01 11:21:55 schorsch Exp $";
 #endif
 /*
  * Allocate and control dynamic color table.
@@ -16,7 +16,10 @@ static const char	RCSid[] = "$Id: rhd_ctab.c,v 3.3 200
  *	except there is no color mapping, since the tm library is used.
  */
 
+#include <string.h>
+
 #include "standard.h"
+#include "rhdisp.h"
 #include "color.h"
 				/* histogram resolution */
 #define NRED		24
@@ -49,12 +52,15 @@ 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();
+static void cut(CNODE *tree, int level, int box[3][2], int c0, int c1);
+static int split(int box[3][2]);
 
 
-int
-new_ctab(ncolors)		/* start new color table with max ncolors */
-int	ncolors;
+
+extern int
+new_ctab(		/* start new color table with max ncolors */
+	int	ncolors
+)
 {
 	int	treesize;
 
@@ -76,18 +82,18 @@ int	ncolors;
 				/* partition color space */
 	cut(ctree, 0, CLRCUBE, 0, ncolors);
 				/* clear histogram */
-	bzero((void *)histo, sizeof(histo));
+	memset((void *)histo, '\0', sizeof(histo));
 				/* return number of colors used */
 	return(ncolors);
 }
 
 
-int
-get_pixel(rgb, set_pixel)	/* get pixel for color */
-BYTE	rgb[3];
-int	(*set_pixel)();
+extern int
+get_pixel(	/* get pixel for color */
+	BYTE	rgb[3],
+	void	(*set_pixel)(int h, int r, int g, int b)
+)
 {
-	extern char	errmsg[];
 	int	r, g, b;
 	int	cv[3];
 	register CNODE	*tp;
@@ -127,9 +133,12 @@ int	(*set_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);
+		{
+			extern char	errmsg[];
+			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);
 	}
@@ -137,12 +146,14 @@ int	(*set_pixel)();
 }
 
 
-static
-cut(tree, level, box, c0, c1)		/* partition color space */
-register CNODE	*tree;
-int	level;
-register int	box[3][2];
-int	c0, c1;
+static void
+cut(		/* partition color space */
+	register CNODE	*tree,
+	int	level,
+	register int	box[3][2],
+	int	c0,
+	int	c1
+)
 {
 	int	kb[3][2];
 	
@@ -152,7 +163,7 @@ int	c0, c1;
 	}
 					/* split box */
 	*tree = split(box);
-	bcopy((void *)box, (void *)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);
@@ -164,8 +175,9 @@ int	c0, c1;
 
 
 static int
-split(box)				/* find median cut for box */
-register int	box[3][2];
+split(				/* find median cut for box */
+	register int	box[3][2]
+)
 {
 #define c0	r
 	register int	r, g, b;