--- ray/src/hd/rhd_qtree.c	1998/08/10 18:39:46	3.18
+++ ray/src/hd/rhd_qtree.c	2003/06/20 00:25:49	3.22
@@ -1,9 +1,6 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rhd_qtree.c,v 3.22 2003/06/20 00:25:49 greg Exp $";
 #endif
-
 /*
  * Quadtree driver support routines.
  */
@@ -31,7 +28,7 @@ struct rleaves	qtL;		/* our pile of leaves */
 
 int	rayqleft = 0;		/* rays left to queue before flush */
 
-static int4	falleaves;	/* our list of fallen leaves */
+static int32	falleaves;	/* our list of fallen leaves */
 
 #define composted(li)	(qtL.bl <= qtL.tl ? \
 					((li) < qtL.bl || (li) >= qtL.tl) : \
@@ -56,7 +53,7 @@ newtwig()			/* allocate a twig */
 	}
 	bi = nexttwig / TBUNDLESIZ;
 	if (twigbundle[bi] == NULL) {	/* new block */
-		twigbundle = (RTREE **)realloc((char *)twigbundle,
+		twigbundle = (RTREE **)realloc((void *)twigbundle,
 					(bi+2)*sizeof(RTREE *));
 		if (twigbundle == NULL)
 			goto memerr;
@@ -89,13 +86,13 @@ int	really;
 	}
 				/* else "really" means free up memory */
 	for (i = 0; twigbundle[i] != NULL; i++)
-		free((char *)twigbundle[i]);
-	free((char *)twigbundle);
+		free((void *)twigbundle[i]);
+	free((void *)twigbundle);
 	twigbundle = NULL;
 }
 
 
-#define	LEAFSIZ		(3*sizeof(float)+sizeof(int4)+\
+#define	LEAFSIZ		(3*sizeof(float)+sizeof(int32)+\
 			sizeof(TMbright)+6*sizeof(BYTE))
 
 int
@@ -122,7 +119,7 @@ register int	n;
 		return(0);
 				/* assign larger alignment types earlier */
 	qtL.wp = (float (*)[3])qtL.base;
-	qtL.wd = (int4 *)(qtL.wp + n);
+	qtL.wd = (int32 *)(qtL.wp + n);
 	qtL.brt = (TMbright *)(qtL.wd + n);
 	qtL.chr = (BYTE (*)[3])(qtL.brt + n);
 	qtL.rgb = (BYTE (*)[3])(qtL.chr + n);
@@ -169,7 +166,7 @@ int
 qtCompost(pct)			/* free up some leaves */
 int	pct;
 {
-	register int4	*fl;
+	register int32	*fl;
 	int	nused, nclear, nmapped;
 				/* figure out how many leaves to clear */
 	nclear = qtL.nl * pct / 100;
@@ -358,10 +355,11 @@ FVECT	d, p;
 	else
 		VCOPY(qtL.wp[li], p);
 	qtL.wd[li] = encodedir(d);
-	tmCvColrs(&qtL.brt[li], qtL.chr[li], c, 1);
+	tmCvColrs(&qtL.brt[li], qtL.chr[li], (COLR *)c, 1);
 	if (putleaf(li, 1)) {
 		if (mapit)
-			tmMapPixels(qtL.rgb+li, qtL.brt+li, qtL.chr+li, 1);
+			tmMapPixels((BYTE *)(qtL.rgb+li), qtL.brt+li,
+					(BYTE *)(qtL.chr+li), 1);
 		if (--rayqleft == 0)
 			dev_flush();		/* flush output */
 	}
@@ -412,12 +410,12 @@ int	redo;
 		if (tmComputeMapping(0., 0., 0.) != TM_E_OK)
 			return(0);
 	}
-	if (tmMapPixels(qtL.rgb+aorg, qtL.brt+aorg,
-			qtL.chr+aorg, alen) != TM_E_OK)
+	if (tmMapPixels((BYTE *)(qtL.rgb+aorg), qtL.brt+aorg,
+			(BYTE *)(qtL.chr+aorg), alen) != TM_E_OK)
 		return(0);
 	if (blen > 0)
-		tmMapPixels(qtL.rgb+borg, qtL.brt+borg,
-				qtL.chr+borg, blen);
+		tmMapPixels((BYTE *)(qtL.rgb+borg), qtL.brt+borg,
+				(BYTE *)(qtL.chr+borg), blen);
 	qtL.tml = qtL.tl;
 	return(1);
 }