--- ray/src/common/face.c	1989/02/02 10:34:31	1.1
+++ ray/src/common/face.c	1991/11/12 16:55:08	2.1
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -51,6 +51,8 @@ OBJREC  *o;
 	if (o->oargs.nfargs < 9 || o->oargs.nfargs % 3)
 		objerror(o, USER, "bad # arguments");
 
+	o->os = (char *)f;			/* save face */
+
 	f->va = o->oargs.farg;
 	f->nv = o->oargs.nfargs / 3;
 						/* compute area and normal */
@@ -69,20 +71,20 @@ OBJREC  *o;
 	f->area = normalize(f->norm);
 	if (f->area == 0.0) {
 		objerror(o, WARNING, "zero area");	/* used to be fatal */
-		f->const = 0.0;
+		f->offset = 0.0;
 		f->ax = 0;
 		return(f);
 	}
 	f->area *= 0.5;
-						/* compute constant */
+						/* compute offset */
 	badvert = 0;
-	f->const = DOT(f->norm, VERTEX(f,0));
+	f->offset = DOT(f->norm, VERTEX(f,0));
 	for (i = 1; i < f->nv; i++) {
 		d1 = DOT(f->norm, VERTEX(f,i));
-		badvert += fabs(d1 - f->const/i) > VERTEPS;
-		f->const += d1;
+		badvert += fabs(d1 - f->offset/i) > VERTEPS;
+		f->offset += d1;
 	}
-	f->const /= f->nv;
+	f->offset /= (double)f->nv;
 	if (badvert)
 		objerror(o, WARNING, "non-planar vertex");
 						/* find axis */
@@ -90,7 +92,6 @@ OBJREC  *o;
 	if (fabs(f->norm[2]) > fabs(f->norm[f->ax]))
 		f->ax = 2;
 
-	(FACE *)o->os = f;			/* save face */
 	return(f);
 }
 
@@ -98,6 +99,8 @@ OBJREC  *o;
 freeface(o)			/* free memory associated with face */
 OBJREC  *o;
 {
+	if (o->os == NULL)
+		return;
 	free(o->os);
 	o->os = NULL;
 }
@@ -110,7 +113,7 @@ FACE  *f;
 	int  ncross, n;
 	double  x, y;
 	register int  xi, yi;
-	register double  *p0, *p1;
+	register FLOAT  *p0, *p1;
 
 	xi = (f->ax+1)%3;
 	yi = (f->ax+2)%3;