--- ray/src/hd/sm_sets.c	1998/09/11 11:52:27	3.2
+++ ray/src/hd/sm_sets.c	2003/02/22 02:07:25	3.6
@@ -1,9 +1,6 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: sm_sets.c,v 3.6 2003/02/22 02:07:25 greg Exp $";
 #endif
-
 /*
  * Quadtree-specific set operations.
  */
@@ -15,10 +12,12 @@ static char SCCSid[] = "$SunId$ SGI";
 
 #define QTSETIBLK	2048     	/* set index allocation block size */
 #define QTELEMBLK	8		/* set element allocation block */
+#define QTELEMMOD(ne)	((ne)&7)	/* (ne) % QTELEMBLK */
 
-#define QTNODESIZ(ne)	((ne) + QTELEMBLK - ((ne) % QTELEMBLK))
+#define QTONTHRESH(ne)	(!QTELEMMOD((ne)+1))
+#define QTNODESIZ(ne)	((ne) + QTELEMBLK - QTELEMMOD(ne))
 
-OBJECT	**qtsettab= NULL;			/* quadtree leaf node table */
+OBJECT	**qtsettab= NULL;		/* quadtree leaf node table */
 QUADTREE  qtnumsets;			/* number of used set indices */
 static int  qtfreesets = EMPTY;		/* free set index list */
 
@@ -27,37 +26,35 @@ QUADTREE
 qtnewleaf(oset)			/* return new leaf node for object set */
 OBJECT  *oset;
 {
-	register QUADTREE  osi;
-	int	nalc;
+  register QUADTREE  osi;
 
-	if (*oset <= 0)
-		return(EMPTY);		/* should be error? */
-	if (qtfreesets != EMPTY) {
-		osi = qtfreesets;
-		qtfreesets = (int)qtsettab[osi];
-	} else if ((osi = qtnumsets++) % QTSETIBLK == 0) {
-		qtsettab = (OBJECT **)realloc((char *)qtsettab,
-				(unsigned)(osi+QTSETIBLK)*sizeof(OBJECT *));
-		if (qtsettab == NULL)
-			goto memerr;
-	}
-	nalc = QTNODESIZ(*oset);
-	if ((qtsettab[osi] = (OBJECT *)malloc(nalc*sizeof(OBJECT))) == NULL)
-		goto memerr;
-	setcopy(qtsettab[osi], oset);
-	return(QT_INDEX(osi));
+  if (*oset <= 0)
+    return(EMPTY);		/* should be error? */
+  if (qtfreesets != EMPTY) {
+    osi = qtfreesets;
+    qtfreesets = (int)qtsettab[osi];
+  } else if ((osi = qtnumsets++) % QTSETIBLK == 0) {
+    qtsettab = (OBJECT **)realloc((char *)qtsettab,
+				  (unsigned)(osi+QTSETIBLK)*sizeof(OBJECT *));
+    if (qtsettab == NULL)
+      goto memerr;
+  }
+  qtsettab[osi] = (OBJECT *)malloc(QTNODESIZ(*oset)*sizeof(OBJECT));
+  if (qtsettab[osi] == NULL)
+    goto memerr;
+  setcopy(qtsettab[osi], oset);
+  return(QT_INDEX(osi));
 memerr:
-	error(SYSTEM, "out of memory in qtnewleaf");
+  error(SYSTEM, "out of memory in qtnewleaf");
 }
 
 
 QUADTREE
-qtdelelem(qt, id)		/* delete element from leaf node, no quest. */
+qtdelelem(qt, id)		/* delete element from leaf node */
 QUADTREE  qt;
 OBJECT  id;
 {
 	register QUADTREE  lf;
-	int  oalc, nalc;
 
 #ifdef DEBUG
 	if(id < 0)
@@ -70,29 +67,26 @@ OBJECT  id;
 	lf = QT_SET_INDEX(qt);
 #endif
 	if (qtsettab[lf][0] <= 1) {		/* blow leaf away */
-		free((char *)qtsettab[lf]);
+		free((void *)qtsettab[lf]);
 		qtsettab[lf] = (OBJECT *)qtfreesets;
 		qtfreesets = lf;
 		return(EMPTY);
-	}					/* else delete element */
-	oalc = QTNODESIZ(qtsettab[lf][0]);
-	nalc = QTNODESIZ(qtsettab[lf][0] - 1);
+	}
 	deletelem(qtsettab[lf], id);
-	if (nalc != oalc)
+	if (QTONTHRESH(qtsettab[lf][0]))
 		qtsettab[lf] = (OBJECT *)realloc((char *)qtsettab[lf],
-				nalc*sizeof(OBJECT));
+				QTNODESIZ(qtsettab[lf][0])*sizeof(OBJECT));
 	return(qt);
 }
 
 
 QUADTREE
-qtaddelem(qt, id)		/* add element to leaf node, no quest. */
+qtaddelem(qt, id)		/* add element to leaf node */
 QUADTREE  qt;
 OBJECT  id;
 {
 	OBJECT	newset[2];
 	register QUADTREE  lf;
-	int  oalc, nalc;
 
 #ifdef DEBUG
 	if(id < 0)
@@ -110,11 +104,9 @@ OBJECT  id;
 #else
 	lf = QT_SET_INDEX(qt);
 #endif
-	oalc = QTNODESIZ(qtsettab[lf][0]);
-	nalc = QTNODESIZ(qtsettab[lf][0] + 1);
-	if (nalc != oalc) {
+	if (QTONTHRESH(qtsettab[lf][0])) {
 		qtsettab[lf] = (OBJECT *)realloc((char *)qtsettab[lf],
-				nalc*sizeof(OBJECT));
+				QTNODESIZ(qtsettab[lf][0]+1)*sizeof(OBJECT));
 		if (qtsettab[lf] == NULL)
 			error(SYSTEM, "out of memory in qtaddelem");
 	}
@@ -147,7 +139,7 @@ QUADTREE  qt;
 	osi = QT_SET_INDEX(qt);
 	if (osi >= qtnumsets)
 		return;
-	free((char *)qtsettab[osi]);
+	free((void *)qtsettab[osi]);
 	qtsettab[osi] = (OBJECT *)qtfreesets;
 	qtfreesets = osi;
 }
@@ -164,8 +156,8 @@ qtfreeleaves()			/* free ALL sets and leaf nodes */
 	}
 	for (i = qtnumsets; i--; )
 		if (qtsettab[i] != NULL)
-			free((char *)qtsettab[i]);
-	free((char *)qtsettab);
+			free((void *)qtsettab[i]);
+	free((void *)qtsettab);
 	qtsettab = NULL;
 	qtnumsets = 0;
 }
@@ -200,4 +192,12 @@ register OBJECT  *cs;                   /* cs' = cs + 
     for (i = os[0]; i-- >= 0; )
        *cs++ = *os++;
 }
+
+
+
+
+
+
+
+