--- ray/src/common/modobject.c	1998/08/11 09:54:34	2.5
+++ ray/src/common/modobject.c	2003/02/22 02:07:22	2.7
@@ -1,13 +1,69 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: modobject.c,v 2.7 2003/02/22 02:07:22 greg Exp $";
 #endif
-
 /*
  *  Routines for tracking object modifiers
+ *
+ *  External symbols declared in object.h
  */
 
+/* ====================================================================
+ * 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  "standard.h"
 
 #include  "object.h"
@@ -15,8 +71,6 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  "otypes.h"
 
 
-extern int  (*addobjnotify[])();	/* people to notify of new objects */
-
 static struct ohtab {
 	int  hsiz;			/* current table size */
 	OBJECT  *htab;			/* table, if allocated */
@@ -31,10 +85,10 @@ register OBJREC  *op;
 {
 	register int  i, j;
 
-	for (i = nobjects>>6; i >= 0; i--) {
+	for (i = nobjects>>OBJBLKSHFT; i >= 0; i--) {
 		j = op - objblock[i];
-		if (j >= 0 && j < 0100)
-			return((i<<6) + j);
+		if (j >= 0 && j < OBJBLKSIZ)
+			return((i<<OBJBLKSHFT) + j);
 	}
 	return(OVOID);
 }
@@ -84,6 +138,7 @@ char  *oname;
 #endif
 
 
+void
 insertobject(obj)		/* insert new object into our list */
 register OBJECT  obj;
 {
@@ -104,6 +159,22 @@ register OBJECT  obj;
 }
 
 
+void
+clearobjndx()			/* clear object hash tables */
+{
+	if (modtab.htab != NULL) {
+		free((void *)modtab.htab);
+		modtab.htab = NULL;
+		modtab.hsiz = 100;
+	}
+	if (objtab.htab != NULL) {
+		free((void *)objtab.htab);
+		objtab.htab = NULL;
+		objtab.hsiz = 100;
+	}
+}
+
+
 static int
 nexthsiz(oldsiz)		/* return next hash table size */
 int  oldsiz;
@@ -156,6 +227,6 @@ tryagain:
 			i = otndx(objptr(oldhtab[ndx])->oname, tab);
 			tab->htab[i] = oldhtab[ndx];
 		}
-	free((char *)oldhtab);
+	free((void *)oldhtab);
 	goto tryagain;			/* should happen only once! */
 }