--- ray/src/common/rglsurf.c	1998/12/11 13:53:32	3.3
+++ ray/src/common/rglsurf.c	2003/02/25 02:47:22	3.5
@@ -1,13 +1,12 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rglsurf.c,v 3.5 2003/02/25 02:47:22 greg Exp $";
 #endif
-
 /*
  * Convert Radiance -> OpenGL surfaces.
  */
 
+#include "copyright.h"
+
 #include "radogl.h"
 
 #ifndef NSLICES
@@ -29,6 +28,7 @@ static char	*glu_rout = "unk";	/* active GLU routine *
 #define NOPOLY()	if (curpolysize) {glEnd(); curpolysize = 0;} else
 
 
+void
 setmaterial(mp, cent, ispoly)	/* prepare for new material */
 register MATREC	*mp;
 FVECT	cent;
@@ -80,7 +80,7 @@ register FVECT	v[];	/* vertex list */
 }
 
 
-static
+static void
 glu_error(en)			/* report an error as a warning */
 GLenum	en;
 {
@@ -111,8 +111,8 @@ newtess()			/* allocate GLU tessellation object */
 {
 	if ((gluto = gluNewTess()) == NULL)
 		error(INTERNAL, "gluNewTess failed");
-	gluTessCallback(gluto, GLU_TESS_BEGIN, glBegin);
-	gluTessCallback(gluto, GLU_TESS_VERTEX, glVertex3dv);
+	gluTessCallback(gluto, GLU_TESS_BEGIN, (_GLUfuncptr)glBegin);
+	gluTessCallback(gluto, GLU_TESS_VERTEX, (_GLUfuncptr)glVertex3dv);
 	gluTessCallback(gluto, GLU_TESS_END, glEnd);
 	gluTessCallback(gluto, GLU_TESS_COMBINE, myCombine);
 	gluTessCallback(gluto, GLU_TESS_ERROR, glu_error);
@@ -130,6 +130,7 @@ newquadric()			/* allocate GLU quadric structure */
 }
 
 
+int
 o_face(o)			/* convert a face */
 register OBJREC	*o;
 {
@@ -143,8 +144,8 @@ register OBJREC	*o;
 	if (area <= FTINY)
 		return;
 	if (dolights)					/* check for source */
-		doflatsrc(o->os, cent, norm, area);
-	setmaterial(o->os, cent, 1);			/* set material */
+		doflatsrc((MATREC *)o->os, cent, norm, area);
+	setmaterial((MATREC *)o->os, cent, 1);		/* set material */
 	if (o->oargs.nfargs/3 != curpolysize) {
 		if (curpolysize) glEnd();
 		curpolysize = o->oargs.nfargs/3;
@@ -179,6 +180,7 @@ register OBJREC	*o;
 }
 
 
+void
 surfclean()			/* clean up surface routines */
 {
 	setmaterial(NULL, NULL, 0);
@@ -194,6 +196,7 @@ surfclean()			/* clean up surface routines */
 }
 
 
+int
 o_sphere(o)			/* convert a sphere */
 register OBJREC	*o;
 {
@@ -206,9 +209,9 @@ register OBJREC	*o;
 	} else if (o->oargs.farg[3] <= FTINY)
 		return;
 	if (dolights)
-		dosphsrc(o->os, o->oargs.farg,
+		dosphsrc((MATREC *)o->os, o->oargs.farg,
 				PI*o->oargs.farg[3]*o->oargs.farg[3]);
-	setmaterial(o->os, o->oargs.farg, 0);
+	setmaterial((MATREC *)o->os, o->oargs.farg, 0);
 	if (gluqo == NULL) newquadric();
 	glu_rout = "making sphere";
 	gluQuadricOrientation(gluqo,
@@ -223,6 +226,7 @@ register OBJREC	*o;
 }
 
 
+int
 o_cone(o)			/* convert a cone or cylinder */
 register OBJREC *o;
 {
@@ -232,7 +236,7 @@ register OBJREC *o;
 
 	iscyl = o->otype==OBJ_CYLINDER | o->otype==OBJ_TUBE;
 	if (o->oargs.nfargs != (iscyl ? 7 : 8))
-		objerror(o, "bad # real arguments");
+		objerror(o, USER, "bad # real arguments");
 	if (o->oargs.farg[6] < -FTINY) {
 		o->oargs.farg[6] = -o->oargs.farg[6];
 		if (iscyl)
@@ -256,7 +260,7 @@ register OBJREC *o;
 	cent[0] = .5*(o->oargs.farg[0] + o->oargs.farg[3]);
 	cent[1] = .5*(o->oargs.farg[1] + o->oargs.farg[4]);
 	cent[2] = .5*(o->oargs.farg[2] + o->oargs.farg[5]);
-	setmaterial(o->os, cent, 0);
+	setmaterial((MATREC *)o->os, cent, 0);
 	if (gluqo == NULL) newquadric();
 	glu_rout = "making cylinder";
 	gluQuadricOrientation(gluqo, o->otype==OBJ_CUP | o->otype==OBJ_TUBE ?
@@ -285,13 +289,14 @@ register OBJREC *o;
 }
 
 
+int
 o_ring(o)			/* convert a ring */
 register OBJREC	*o;
 {
 	double	x1, y1, d;
 
 	if (o->oargs.nfargs != 8)
-		objerror(o, "bad # real arguments");
+		objerror(o, USER, "bad # real arguments");
 	if (o->oargs.farg[7] < o->oargs.farg[6]) {
 		register double	d = o->oargs.farg[7];
 		o->oargs.farg[7] = o->oargs.farg[6];
@@ -304,10 +309,10 @@ register OBJREC	*o;
 	if (o->oargs.farg[7] - o->oargs.farg[6] <= FTINY)
 		return;
 	if (dolights)
-		doflatsrc(o->os, o->oargs.farg, o->oargs.farg+3, 
+		doflatsrc((MATREC *)o->os, o->oargs.farg, o->oargs.farg+3, 
 				PI*(o->oargs.farg[7]*o->oargs.farg[7] -
 					o->oargs.farg[6]*o->oargs.farg[6]));
-	setmaterial(o->os, o->oargs.farg, 0);
+	setmaterial((MATREC *)o->os, o->oargs.farg, 0);
 	if (gluqo == NULL) newquadric();
 	glu_rout = "making disk";
 	gluQuadricOrientation(gluqo, GLU_OUTSIDE);