--- ray/src/common/color.h	2003/06/30 19:04:29	2.24
+++ ray/src/common/color.h	2003/10/18 04:46:24	2.27
@@ -1,4 +1,4 @@
-/* RCSid $Id: color.h,v 2.24 2003/06/30 19:04:29 greg Exp $ */
+/* RCSid $Id: color.h,v 2.27 2003/10/18 04:46:24 greg Exp $ */
 /*
  *  color.h - header for routines using pixel color values.
  *
@@ -11,12 +11,13 @@
  */
 #ifndef _RAD_COLOR_H_
 #define _RAD_COLOR_H_
+
+#include <stdlib.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdlib.h>
-
 #define  RED		0
 #define  GRN		1
 #define  BLU		2
@@ -112,7 +113,7 @@ typedef float  COLORMAT[3][3];	/* color coordinate con
 #define  D65EFFICACY		203.		/* standard illuminant D65 */
 #define  INCEFFICACY		160.		/* illuminant A (incand.) */
 #define  SUNEFFICACY		208.		/* illuminant B (solar dir.) */
-#define  SKYEFFICACY		D65EFFICACY	/* skylight */
+#define  SKYEFFICACY		D65EFFICACY	/* skylight (should be 110) */
 #define  DAYEFFICACY		D65EFFICACY	/* combined sky and solar */
 
 #define  luminance(col)		(WHTEFFICACY * bright(col))
@@ -225,8 +226,8 @@ extern void	compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr
 extern void	comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr);
 extern void	comprgb2rgbWBmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
 					/* defined in colrops.c */
-extern int	setcolrcor(double (*f)(), double a2);
-extern int	setcolrinv(double (*f)(), double a2);
+extern int	setcolrcor(double (*f)(double, double), double a2);
+extern int	setcolrinv(double (*f)(double, double), double a2);
 extern int	setcolrgam(double g);
 extern int	colrs_gambs(COLR *scan, int len);
 extern int	gambs_colrs(COLR *scan, int len);