--- ray/src/common/colrops.c	2003/02/25 02:47:21	2.7
+++ ray/src/common/colrops.c	2003/07/30 10:11:06	2.11
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: colrops.c,v 2.7 2003/02/25 02:47:21 greg Exp $";
+static const char	RCSid[] = "$Id: colrops.c,v 2.11 2003/07/30 10:11:06 schorsch Exp $";
 #endif
 /*
  * Integer operations on COLR scanlines
@@ -7,13 +7,13 @@ static const char	RCSid[] = "$Id: colrops.c,v 2.7 2003
 
 #include "copyright.h"
 
+#include <stdio.h>
 #include <math.h>
+
+#include "rtmisc.h"
 #include "color.h"
 
-#define NULL		0
 
-extern char	*bmalloc();
-
 #define MAXGSHIFT	31		/* maximum shift for gamma table */
 
 static BYTE	*g_mant = NULL, *g_nexp = NULL;
@@ -23,7 +23,7 @@ static BYTE	(*g_bval)[256] = NULL;
 
 int
 setcolrcor(f, a2)		/* set brightness correction */
-double	(*f)();
+double	(*f)(double,double);
 double	a2;
 {
 	double	mult;
@@ -45,7 +45,7 @@ double	a2;
 
 int
 setcolrinv(f, a2)		/* set inverse brightness correction */
-double	(*f)();
+double	(*f)(double,double);
 double	a2;
 {
 	double	mult;
@@ -136,7 +136,7 @@ int	len;
 {
 	register int	nexpo;
 
-	if (g_mant == NULL | g_nexp == NULL)
+	if ((g_mant == NULL) | (g_nexp == NULL))
 		return(-1);
 	while (len-- > 0) {
 		nexpo = g_nexp[scan[0][RED]];