--- ray/src/common/rglmat.c	1998/06/09 11:18:35	3.1
+++ ray/src/common/rglmat.c	2003/02/22 02:07:22	3.2
@@ -1,22 +1,75 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rglmat.c,v 3.2 2003/02/22 02:07:22 greg Exp $";
 #endif
-
 /*
  * Routines for Radiance -> OpenGL materials.
  */
 
+/* ====================================================================
+ * 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 "radogl.h"
 
-extern int	free(), freemtl();
-
 int	domats = 1;			/* are we doing materials? */
 
 LUTAB	mtab = LU_SINIT(free,freemtl);
 
 
+void
 rgl_matclear()			/* clean up materials */
 {
 	lu_done(&mtab);
@@ -38,6 +91,7 @@ char	*nam;
 }
 
 
+int
 o_default(o)			/* default object is non-material modifier */
 register OBJREC	*o;
 {
@@ -55,7 +109,7 @@ register OBJREC	*o;
 			goto memerr;
 		strcpy(lup->key, o->oname);
 	} else if (lup->data != NULL)
-		freemtl(lup->data);
+		freemtl((MATREC *)lup->data);
 	if ((lup->data = o->os) != NULL)	/* make material reference */
 		((MATREC *)lup->data)->nlinks++;
 	return;
@@ -78,7 +132,7 @@ char	*nam;
 			goto memerr;
 		strcpy(lup->key, nam);
 	} else if (lup->data != NULL)
-		freemtl(lup->data);
+		freemtl((MATREC *)lup->data);
 	lup->data = (char *)malloc(sizeof(MATREC));
 	if (lup->data == NULL)
 		goto memerr;
@@ -89,14 +143,16 @@ memerr:
 }
 
 
+void
 freemtl(mp)			/* free a material */
 register MATREC	*mp;
 {
 	if (!--mp->nlinks)
-		free((char *)mp);
+		free((void *)mp);
 }
 
 
+int
 m_normal(o)			/* compute normal material parameters */
 register OBJREC	*o;
 {
@@ -128,6 +184,7 @@ register OBJREC	*o;
 }
 
 
+int
 m_aniso(o)			/* anisotropic material */
 register OBJREC	*o;
 {
@@ -159,6 +216,7 @@ register OBJREC	*o;
 }
 
 
+int
 m_glass(o)			/* glass material (hopeless) */
 OBJREC	*o;
 {
@@ -172,6 +230,7 @@ OBJREC	*o;
 }
 
 
+int
 m_brdf(o)			/* convert functional material */
 register OBJREC	*o;
 {
@@ -198,6 +257,7 @@ register OBJREC	*o;
 }
 
 
+int
 m_brdf2(o)			/* convert advanced functional material */
 register OBJREC	*o;
 {
@@ -217,6 +277,7 @@ register OBJREC	*o;
 }
 
 
+int
 m_light(o)			/* convert light type */
 register OBJREC	*o;
 {
@@ -245,6 +306,7 @@ register OBJREC	*o;
 }
 
 
+int
 m_mirror(o)			/* convert mirror type */
 register OBJREC	*o;
 {
@@ -261,6 +323,7 @@ register OBJREC	*o;
 }
 
 
+int
 m_prism(o)			/* convert prism type */
 register OBJREC	*o;
 {