--- ray/src/hd/rhd_odraw.c	1999/03/08 17:31:49	3.12
+++ ray/src/hd/rhd_odraw.c	2003/03/04 05:49:21	3.14
@@ -1,9 +1,6 @@
-/* Copyright (c) 1999 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rhd_odraw.c,v 3.14 2003/03/04 05:49:21 greg Exp $";
 #endif
-
 /*
  * Routines for drawing samples using depth buffer checks.
  */
@@ -61,12 +58,12 @@ int	n;
 
 	if (odNViews > 0) {		/* deallocate view structures */
 		for (i = odNViews; i--; ) {
-			free((char *)odView[i].bmap);
-			free((char *)odView[i].pmap);
+			free((void *)odView[i].bmap);
+			free((void *)odView[i].pmap);
 			if (odView[i].emap != NULL)
-				free((char *)odView[i].emap);
+				free((void *)odView[i].emap);
 		}
-		free((char *)odView);
+		free((void *)odView);
 		odView = NULL;
 		odNViews = 0;
 	}
@@ -300,7 +297,7 @@ FVECT	d, p;
 		if (id < 0)
 			continue;		/* not good enough */
 							/* convert color */
-		tmCvColrs(&odS.brt[id], odS.chr[id], c, 1);
+		tmCvColrs(&odS.brt[id], odS.chr[id], (COLR *)c, 1);
 		if (imm_mode | needmapping)		/* if immediate mode */
 			needmapping |= NEWRGB;		/* map it later */
 		else					/* else map it now */
@@ -381,7 +378,7 @@ GLfloat	*dm;
 		if (vn<0 | vn>=odNViews)
 			return;			/* too late -- they're gone! */
 		if (odView[vn].emap != NULL)
-			free((char *)odView[vn].emap);
+			free((void *)odView[vn].emap);
 		odView[vn].emap = NULL;
 		odView[vn].dmap = NULL;
 		return;
@@ -464,7 +461,8 @@ int	vn;
 			needmapping &= ~NEWMAP;
 			odRedrawAll();			/* redraw everything */
 		}
-		if (tmMapPixels(odS.rgb,odS.brt,odS.chr,odS.nsamp) != TM_E_OK)
+		if (tmMapPixels((BYTE *)(odS.rgb), odS.brt,
+				(BYTE *)(odS.chr), odS.nsamp) != TM_E_OK)
 			return;
 		needmapping &= ~NEWRGB;
 	}