--- ray/src/common/color.h	1995/11/10 17:04:19	2.11
+++ ray/src/common/color.h	1997/01/31 12:39:12	2.13
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1997 Regents of the University of California */
 
 /* SCCSid "$SunId$ LBL" */
 
@@ -187,12 +187,17 @@ extern double  atof(), ldexp(), frexp();
 extern RGBPRIMS  stdprims;		/* standard primary chromaticities */
 extern COLORMAT  rgb2xyzmat;		/* RGB to XYZ conversion matrix */
 extern COLORMAT  xyz2rgbmat;		/* XYZ to RGB conversion matrix */
+extern COLOR  cblack, cwhite;		/* black (0,0,0) and white (1,1,1) */
 
-#define  cie_rgb(rgb,xyz)	colortrans(rgb,xyz2rgbmat,xyz)
+#define  CGAMUT_LOWER		01
+#define  CGAMUT_UPPER		02
+#define  CGAMUT			(CGAMUT_LOWER|CGAMUT_UPPER)
+
 #define  rgb_cie(xyz,rgb)	colortrans(xyz,rgb2xyzmat,rgb)
 
 #ifdef BSD
 #define  cpcolormat(md,ms)	bcopy((char *)ms,(char *)md,sizeof(COLORMAT))
 #else
+extern char  *memcpy();
 #define  cpcolormat(md,ms)	(void)memcpy((char *)md,(char *)ms,sizeof(COLORMAT))
 #endif