--- ray/src/common/rglsurf.c	2003/02/22 02:07:22	3.4
+++ ray/src/common/rglsurf.c	2003/04/23 02:28:06	3.7
@@ -1,66 +1,11 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rglsurf.c,v 3.4 2003/02/22 02:07:22 greg Exp $";
+static const char	RCSid[] = "$Id: rglsurf.c,v 3.7 2003/04/23 02:28:06 greg Exp $";
 #endif
 /*
  * Convert Radiance -> OpenGL surfaces.
  */
 
-/* ====================================================================
- * 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 "copyright.h"
 
 #include "radogl.h"
 
@@ -166,8 +111,8 @@ newtess()			/* allocate GLU tessellation object */
 {
 	if ((gluto = gluNewTess()) == NULL)
 		error(INTERNAL, "gluNewTess failed");
-	gluTessCallback(gluto, GLU_TESS_BEGIN, (_GLUfuncptr)glBegin);
-	gluTessCallback(gluto, GLU_TESS_VERTEX, (_GLUfuncptr)glVertex3dv);
+	gluTessCallback(gluto, GLU_TESS_BEGIN, glBegin);
+	gluTessCallback(gluto, GLU_TESS_VERTEX, glVertex3dv);
 	gluTessCallback(gluto, GLU_TESS_END, glEnd);
 	gluTessCallback(gluto, GLU_TESS_COMBINE, myCombine);
 	gluTessCallback(gluto, GLU_TESS_ERROR, glu_error);
@@ -197,7 +142,7 @@ register OBJREC	*o;
 		objerror(o, USER, "bad # real arguments");
 	area = polyarea(cent, norm, o->oargs.nfargs/3, (FVECT *)o->oargs.farg);
 	if (area <= FTINY)
-		return;
+		return(0);
 	if (dolights)					/* check for source */
 		doflatsrc((MATREC *)o->os, cent, norm, area);
 	setmaterial((MATREC *)o->os, cent, 1);		/* set material */
@@ -232,6 +177,7 @@ register OBJREC	*o;
 					(GLdouble)o->oargs.farg[3*i+1],
 					(GLdouble)o->oargs.farg[3*i+2]);
 	}
+	return(0);
 }
 
 
@@ -262,7 +208,7 @@ register OBJREC	*o;
 		o->otype = o->otype==OBJ_SPHERE ? OBJ_BUBBLE : OBJ_SPHERE;
 		o->oargs.farg[3] = -o->oargs.farg[3];
 	} else if (o->oargs.farg[3] <= FTINY)
-		return;
+		return(0);
 	if (dolights)
 		dosphsrc((MATREC *)o->os, o->oargs.farg,
 				PI*o->oargs.farg[3]*o->oargs.farg[3]);
@@ -278,6 +224,7 @@ register OBJREC	*o;
 			(GLdouble)o->oargs.farg[2]);
 	gluSphere(gluqo, (GLdouble)o->oargs.farg[3], NSLICES, NSTACKS);
 	glPopMatrix();
+	return(0);
 }
 
 
@@ -341,6 +288,7 @@ register OBJREC *o;
 	gluCylinder(gluqo, o->oargs.farg[6], o->oargs.farg[iscyl ? 6 : 7],
 			h, NSLICES, 1);
 	glPopMatrix();
+	return(0);
 }
 
 
@@ -390,4 +338,5 @@ register OBJREC	*o;
 		glRotated(d, (GLdouble)x1, (GLdouble)y1, 0.);
 	gluDisk(gluqo, o->oargs.farg[6], o->oargs.farg[7], NSLICES, 1);
 	glPopMatrix();
+	return(0);
 }