--- ray/src/rt/colortab.c 1990/03/29 12:43:07 1.14 +++ ray/src/rt/colortab.c 1990/11/07 17:16:58 1.15 @@ -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; @@ -111,7 +111,7 @@ int (*set_pixel)(); if (cv[prim(*tp)] < part(*tp)) tp += 1<