--- ray/src/hd/rhpict.c	2003/02/22 02:07:25	3.8
+++ ray/src/hd/rhpict.c	2003/10/22 02:06:34	3.16
@@ -1,10 +1,13 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhpict.c,v 3.8 2003/02/22 02:07:25 greg Exp $";
+static const char	RCSid[] = "$Id: rhpict.c,v 3.16 2003/10/22 02:06:34 greg Exp $";
 #endif
 /*
  * Radiance holodeck picture generator
  */
 
+#include <string.h>
+
+#include "platform.h"
 #include "rholo.h"
 #include "view.h"
 
@@ -54,7 +57,7 @@ char	*argv[];
 				pixaspect = atof(argv[++i]);
 			else if (argv[i][2] == 'e') {
 				expval = atof(argv[++i]);
-				if (argv[i][0] == '-' | argv[i][0] == '+')
+				if ((argv[i][0] == '-') | (argv[i][0] == '+'))
 					expval = pow(2., expval);
 			} else
 				goto userr;
@@ -167,7 +170,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;
 
@@ -210,18 +213,18 @@ int	fn;
 	fputs(VIEWSTR, stdout);
 	fprintview(&myview, stdout);
 	fputc('\n', stdout);
-	if (pa < 0.99 | pa > 1.01)
+	if ((pa < 0.99) | (pa > 1.01))
 		fputaspect(pa, stdout);
-	if (expval < 0.99 | expval > 1.01)
+	if ((expval < 0.99) | (expval > 1.01))
 		fputexpos(expval, stdout);
 	fputformat(COLRFMT, stdout);
 	fputc('\n', stdout);
 				/* 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,17 +232,18 @@ 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--; ) {
 		if (myweight[p] <= FTINY) {
-			if (lastr >= 0)
+			if (lastr >= 0) {
 				if (p/hres == lastp/hres)
 					copycolor(mypixel[p], mypixel[lastp]);
 				else
 					copycolor(mypixel[p], mypixel[lastrp]);
+			}
 			nunrend++;
 			continue;
 		}
@@ -260,11 +264,10 @@ endpicture()			/* finish and write out pixels */
 
 initialize()			/* initialize holodeck and buffers */
 {
-	extern long	ftell();
 	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);
@@ -282,7 +285,7 @@ initialize()			/* initialize holodeck and buffers */
 	fd = dup(fileno(fp));			/* dup file descriptor */
 	fclose(fp);				/* done with stdio */
 	for (n = 0; nextloc > 0L; n++) {	/* initialize each section */
-		lseek(fd, (off_t)nextloc, 0);
+		lseek(fd, (off_t)nextloc, SEEK_SET);
 		read(fd, (char *)&nextloc, sizeof(nextloc));
 		hdinit(fd, NULL);
 	}
@@ -290,7 +293,7 @@ initialize()			/* initialize holodeck and buffers */
 	mypixel = (COLOR *)bmalloc(xres*yres*sizeof(COLOR));
 	myweight = (float *)bmalloc(xres*yres*sizeof(float));
 	mydepth = (float *)bmalloc(xres*yres*sizeof(float));
-	if (mypixel == NULL | myweight == NULL | mydepth == NULL)
+	if ((mypixel == NULL) | (myweight == NULL) | (mydepth == NULL))
 		error(SYSTEM, "out of memory in initialize");
 }