--- ray/src/common/cone.c	2003/02/22 02:07:22	2.5
+++ ray/src/common/cone.c	2003/07/27 22:12:01	2.9
@@ -1,66 +1,11 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: cone.c,v 2.5 2003/02/22 02:07:22 greg Exp $";
+static const char	RCSid[] = "$Id: cone.c,v 2.9 2003/07/27 22:12:01 schorsch Exp $";
 #endif
 /*
  *  cone.c - routines for making cones
  */
 
-/* ====================================================================
- * 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  "standard.h"
 
@@ -111,7 +56,7 @@ int  getxf;
 
 		co->ca = o->oargs.farg;
 						/* get radii */
-		if (o->otype == OBJ_CYLINDER | o->otype == OBJ_TUBE) {
+		if ((o->otype == OBJ_CYLINDER) | (o->otype == OBJ_TUBE)) {
 			if (o->oargs.nfargs != 7)
 				goto argcerr;
 			if (co->ca[6] < -FTINY) {
@@ -134,7 +79,7 @@ int  getxf;
 			else sgn1 = 0;
 			if (sgn0+sgn1 == 0)
 				goto raderr;
-			if (sgn0 < 0 | sgn1 < 0) {
+			if ((sgn0 < 0) | (sgn1 < 0)) {
 				objerror(o, o->otype==OBJ_RING?USER:WARNING,
 					"negative radii");
 				o->otype = o->otype == OBJ_CONE ?
@@ -181,7 +126,7 @@ int  getxf;
 		if (o->otype == OBJ_RING) {
 			co->al = 0.0;
 			co->sl = CO_R1(co) - CO_R0(co);
-		} else if (o->otype == OBJ_CONE | o->otype == OBJ_CUP) {
+		} else if ((o->otype == OBJ_CONE) | (o->otype == OBJ_CUP)) {
 			co->sl = co->ca[7] - co->ca[6];
 			co->sl = sqrt(co->sl*co->sl + co->al*co->al);
 		} else { /* OBJ_CYLINDER or OBJ_TUBE */
@@ -198,6 +143,7 @@ argcerr:
 	objerror(o, USER, "bad # arguments");
 raderr:
 	objerror(o, USER, "illegal radii");
+	return NULL; /* pro forma return */
 }
 
 
@@ -224,7 +170,7 @@ register CONE  *co;
 	register double  d;
 	register int  i;
 
-	co->tm = (FLOAT (*)[4])malloc(sizeof(MAT4));
+	co->tm = (RREAL (*)[4])malloc(sizeof(MAT4));
 	if (co->tm == NULL)
 		error(SYSTEM, "out of memory in conexform");
 
@@ -260,7 +206,7 @@ register CONE  *co;
 	multmat4(co->tm, co->tm, m4);
 
 				/* scale z-axis */
-	if (co->p0 != co->p1 & co->r0 != co->r1) {
+	if ((co->p0 != co->p1) & (co->r0 != co->r1)) {
 		setident4(m4);
 		m4[2][2] = (CO_R1(co) - CO_R0(co)) / co->al;
 		multmat4(co->tm, co->tm, m4);