--- ray/src/hd/rhpict.c	2003/05/29 16:26:22	3.9
+++ ray/src/hd/rhpict.c	2003/07/07 17:21:51	3.12
@@ -1,10 +1,12 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhpict.c,v 3.9 2003/05/29 16:26:22 greg Exp $";
+static const char	RCSid[] = "$Id: rhpict.c,v 3.12 2003/07/07 17:21:51 greg Exp $";
 #endif
 /*
  * Radiance holodeck picture generator
  */
 
+#include <string.h>
+
 #include "rholo.h"
 #include "view.h"
 
@@ -167,7 +169,7 @@ render_frame(bl, nb)		/* render frame from beam values
 register PACKHEAD	*bl;
 int	nb;
 {
-	extern int	pixBeam();
+	extern void	pixBeam();
 	register HDBEAMI	*bil;
 	register int	i;
 
@@ -219,9 +221,9 @@ int	fn;
 				/* write resolution (standard order) */
 	fprtresolu(hres, vres, stdout);
 				/* prepare image buffers */
-	bzero((char *)mypixel, hres*vres*sizeof(COLOR));
-	bzero((char *)myweight, hres*vres*sizeof(float));
-	bzero((char *)mydepth, hres*vres*sizeof(float));
+	memset((char *)mypixel, '\0', hres*vres*sizeof(COLOR));
+	memset((char *)myweight, '\0', hres*vres*sizeof(float));
+	memset((char *)mydepth, '\0', hres*vres*sizeof(float));
 }
 
 
@@ -229,8 +231,8 @@ int
 endpicture()			/* finish and write out pixels */
 {
 	int	lastr = -1, nunrend = 0;
-	int4	lastp, lastrp;
-	register int4	p;
+	int32	lastp, lastrp;
+	register int32	p;
 	register double	d;
 				/* compute final pixel values */
 	for (p = hres*vres; p--; ) {
@@ -263,7 +265,7 @@ initialize()			/* initialize holodeck and buffers */
 	int	fd;
 	FILE	*fp;
 	int	n;
-	int4	nextloc;
+	int32	nextloc;
 					/* open holodeck file */
 	if ((fp = fopen(hdkfile, "r")) == NULL) {
 		sprintf(errmsg, "cannot open \"%s\" for reading", hdkfile);