--- ray/src/rt/colortab.c	1989/10/03 14:06:58	1.4
+++ ray/src/rt/colortab.c	1989/10/04 09:23:38	1.6
@@ -27,7 +27,7 @@ static char SCCSid[] = "$SunId$ LBL";
 				/* minimum box count for adaptive partition */
 #define MINSAMP		7
 				/* maximum distance^2 before color reassign */
-#define MAXDST2		5
+#define MAXDST2		12
 				/* maximum frame buffer depth */
 #define FBDEPTH		8
 				/* map a color */
@@ -42,7 +42,7 @@ static char SCCSid[] = "$SunId$ LBL";
 #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 */
@@ -61,8 +61,10 @@ int
 new_ctab(ncolors)		/* start new color table with max ncolors */
 int	ncolors;
 {
-	if (ncolors < 1 || ncolors > 1<<FBDEPTH)
+	if (ncolors < 1)
 		return(0);
+	if (ncolors > 1<<FBDEPTH)
+		ncolors = 1<<FBDEPTH;
 				/* clear color table */
 	bzero(clrtab, sizeof(clrtab));
 				/* partition color space */