--- ray/src/common/colrops.c	1998/01/21 12:55:00	2.5
+++ ray/src/common/colrops.c	2003/02/22 02:07:22	2.6
@@ -1,13 +1,68 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: colrops.c,v 2.6 2003/02/22 02:07:22 greg Exp $";
 #endif
-
 /*
  * Integer operations on COLR scanlines
  */
 
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
+ *
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *         notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
+ */
+
+#include <math.h>
 #include "color.h"
 
 #define NULL		0
@@ -20,11 +75,8 @@ static BYTE	*g_mant = NULL, *g_nexp = NULL;
 
 static BYTE	(*g_bval)[256] = NULL;
 
-#ifndef pow
-extern double	pow();
-#endif
 
-
+int
 setcolrcor(f, a2)		/* set brightness correction */
 double	(*f)();
 double	a2;
@@ -46,6 +98,7 @@ double	a2;
 }
 
 
+int
 setcolrinv(f, a2)		/* set inverse brightness correction */
 double	(*f)();
 double	a2;
@@ -71,6 +124,7 @@ double	a2;
 }
 
 
+int
 setcolrgam(g)			/* set gamma conversion */
 double	g;
 {
@@ -80,6 +134,7 @@ double	g;
 }
 
 
+int
 colrs_gambs(scan, len)		/* convert scanline of colrs to gamma bytes */
 register COLR	*scan;
 int	len;
@@ -129,6 +184,7 @@ int	len;
 }
 
 
+int
 gambs_colrs(scan, len)		/* convert gamma bytes to colr scanline */
 register COLR	*scan;
 int	len;
@@ -165,6 +221,7 @@ int	len;
 }
 
 
+void
 shiftcolrs(scan, len, adjust)	/* shift a scanline of colors by 2^adjust */
 register COLR	*scan;
 register int	len;
@@ -186,6 +243,7 @@ register int	adjust;
 }
 
 
+void
 normcolrs(scan, len, adjust)	/* normalize a scanline of colrs */
 register COLR  *scan;
 int  len;