--- ray/src/common/octree.c	2003/02/22 02:07:22	2.5
+++ ray/src/common/octree.c	2009/11/01 04:41:55	2.8
@@ -1,66 +1,11 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: octree.c,v 2.5 2003/02/22 02:07:22 greg Exp $";
+static const char	RCSid[] = "$Id: octree.c,v 2.8 2009/11/01 04:41:55 greg Exp $";
 #endif
 /*
  *  octree.c - routines dealing with octrees and cubes.
  */
 
-/* ====================================================================
- * 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"
 
@@ -74,7 +19,7 @@ static OCTREE  treetop = 0;		/* next free node */
 OCTREE
 octalloc()			/* allocate an octree */
 {
-	register OCTREE  freet;
+	OCTREE  freet;
 
 	if ((freet = ofreelist) != EMPTY) {
 		ofreelist = octkid(freet, 0);
@@ -89,16 +34,16 @@ octalloc()			/* allocate an octree */
 				(unsigned)OCTBLKSIZ*8*sizeof(OCTREE))) == NULL)
 			return(EMPTY);
 	}
-	treetop += 8;
+	treetop++;
 	return(freet);
 }
 
 
 void
 octfree(ot)			/* free an octree */
-register OCTREE  ot;
+OCTREE  ot;
 {
-	register int  i;
+	int  i;
 
 	if (!istree(ot))
 		return;
@@ -112,7 +57,7 @@ register OCTREE  ot;
 void
 octdone()			/* free EVERYTHING */
 {
-	register int	i;
+	int	i;
 
 	for (i = 0; i < MAXOBLK; i++) {
 		if (octblock[i] == NULL)
@@ -127,10 +72,10 @@ octdone()			/* free EVERYTHING */
 
 OCTREE
 combine(ot)			/* recursively combine nodes */
-register OCTREE  ot;
+OCTREE  ot;
 {
-	register int  i;
-	register OCTREE  ores;
+	int  i;
+	OCTREE  ores;
 
 	if (!istree(ot))	/* not a tree */
 		return(ot);
@@ -148,10 +93,10 @@ register OCTREE  ot;
 
 void
 culocate(cu, pt)		/* locate point within cube */
-register CUBE  *cu;
-register FVECT  pt;
+CUBE  *cu;
+FVECT  pt;
 {
-	register int  i;
+	int  i;
 	int  branch;
 
 	while (istree(cu->cutree)) {
@@ -167,20 +112,10 @@ register FVECT  pt;
 }
 
 
-void
-cucopy(cu1, cu2)		/* copy cu2 into cu1 */
-register CUBE  *cu1, *cu2;
-{
-	cu1->cutree = cu2->cutree;
-	cu1->cusize = cu2->cusize;
-	VCOPY(cu1->cuorg, cu2->cuorg);
-}
-
-
 int
 incube(cu, pt)			/* determine if a point is inside a cube */
-register CUBE  *cu;
-register FVECT  pt;
+CUBE  *cu;
+FVECT  pt;
 {
 	if (cu->cuorg[0] > pt[0] || pt[0] >= cu->cuorg[0] + cu->cusize)
 		return(0);