--- ray/src/common/cone.c	1989/02/02 10:34:30	1.1
+++ ray/src/common/cone.c	1991/01/19 13:43:28	1.3
@@ -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";
@@ -68,8 +68,10 @@ int  getxf;
 		} else {
 			if (o->oargs.nfargs != 8)
 				goto argcerr;
-			if (co->ca[6] < 0.0 || co->ca[7] < 0.0)
+			if (co->ca[6] < -FTINY || co->ca[7] < -FTINY)
 				goto raderr;
+			if (co->ca[6] < 0.0) co->ca[6] = 0.0;
+			if (co->ca[7] < 0.0) co->ca[7] = 0.0;
 			if (fabs(co->ca[7] - co->ca[6]) <= FTINY)
 				goto raderr;
 			co->r0 = 6;
@@ -104,7 +106,7 @@ int  getxf;
 			co->sl = co->al;
 		}
 		co->tm = NULL;
-		(CONE *)o->os = co;
+		o->os = (char *)co;
 	}
 	if (getxf && co->tm == NULL)
 		conexform(co);