--- ray/src/common/octree.c	1998/08/24 16:38:44	2.4
+++ ray/src/common/octree.c	2003/02/22 02:07:22	2.5
@@ -1,13 +1,65 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: octree.c,v 2.5 2003/02/22 02:07:22 greg Exp $";
 #endif
-
 /*
  *  octree.c - routines dealing with octrees and cubes.
+ */
+
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
  *
- *     7/28/85
+ * 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  "standard.h"
@@ -33,7 +85,7 @@ octalloc()			/* allocate an octree */
 		errno = 0;
 		if (octbi(freet) >= MAXOBLK)
 			return(EMPTY);
-		if ((octblock[octbi(freet)] = (OCTREE *)bmalloc(
+		if ((octblock[octbi(freet)] = (OCTREE *)malloc(
 				(unsigned)OCTBLKSIZ*8*sizeof(OCTREE))) == NULL)
 			return(EMPTY);
 	}
@@ -42,6 +94,7 @@ octalloc()			/* allocate an octree */
 }
 
 
+void
 octfree(ot)			/* free an octree */
 register OCTREE  ot;
 {
@@ -56,6 +109,7 @@ register OCTREE  ot;
 }
 
 
+void
 octdone()			/* free EVERYTHING */
 {
 	register int	i;
@@ -63,7 +117,7 @@ octdone()			/* free EVERYTHING */
 	for (i = 0; i < MAXOBLK; i++) {
 		if (octblock[i] == NULL)
 			break;
-		bfree((char *)octblock[i], (unsigned)256*8*sizeof(OCTREE));
+		free((void *)octblock[i]);
 		octblock[i] = NULL;
 	}
 	ofreelist = EMPTY;
@@ -92,6 +146,7 @@ register OCTREE  ot;
 }
 
 
+void
 culocate(cu, pt)		/* locate point within cube */
 register CUBE  *cu;
 register FVECT  pt;
@@ -112,6 +167,7 @@ register FVECT  pt;
 }
 
 
+void
 cucopy(cu1, cu2)		/* copy cu2 into cu1 */
 register CUBE  *cu1, *cu2;
 {
@@ -121,6 +177,7 @@ register CUBE  *cu1, *cu2;
 }
 
 
+int
 incube(cu, pt)			/* determine if a point is inside a cube */
 register CUBE  *cu;
 register FVECT  pt;