--- ray/src/hd/rhpict.c	1999/03/09 14:23:51	3.5
+++ ray/src/hd/rhpict.c	2003/07/27 22:12:02	3.14
@@ -1,24 +1,24 @@
-/* Copyright (c) 1999 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rhpict.c,v 3.14 2003/07/27 22:12:02 schorsch Exp $";
 #endif
-
 /*
  * Radiance holodeck picture generator
  */
 
+#include <string.h>
+
 #include "rholo.h"
 #include "view.h"
-#include "resolu.h"
 
 char	*progname;		/* our program name */
 char	*hdkfile;		/* holodeck file name */
+char	gargc;			/* global argc */
+char	**gargv;		/* global argv */
 
 VIEW	myview = STDVIEW;	/* current output view */
 int	xres = 512, yres = 512;	/* max. horizontal and vertical resolution */
 char	*outspec = NULL;	/* output file specification */
-int	randflag = 0;		/* random resampling algorithm? */
+double	randfrac = -1.;		/* random resampling fraction */
 double	pixaspect = 1.;		/* pixel aspect ratio */
 int	seqstart = 0;		/* sequence start frame */
 double	expval = 1.;		/* exposure value */
@@ -37,6 +37,7 @@ char	*argv[];
 {
 	int	i, rval;
 
+	gargc = argc; gargv = argv;
 	progname = argv[0];			/* get arguments */
 	for (i = 1; i < argc && argv[i][0] == '-'; i++) {
 		rval = getviewopt(&myview, argc-i, argv+i);
@@ -55,7 +56,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;
@@ -76,10 +77,12 @@ char	*argv[];
 			outspec = argv[++i];
 			break;
 		case 'r':			/* random sampling */
-			randflag = 1;
+			if (badarg(argc-i-1,argv+i+1,"f"))
+				goto userr;
+			randfrac = atof(argv[++i]);
 			break;
 		case 's':			/* smooth sampling */
-			randflag = 0;
+			randfrac = -1.;
 			break;
 		case 'S':			/* sequence start */
 			if (badarg(argc-i-1,argv+i+1,"i"))
@@ -118,7 +121,7 @@ char	*argv[];
 	quit(0);				/* all done! */
 userr:
 	fprintf(stderr,
-"Usage: %s [-w][-r|-s][-pa pa][-pe ex][-x hr][-y vr][-S stfn][-o outp][view] input.hdk\n",
+"Usage: %s [-w][-r rf][-pa pa][-pe ex][-x hr][-y vr][-S stfn][-o outp][view] input.hdk\n",
 			progname);
 	quit(1);
 }
@@ -142,7 +145,7 @@ int	fn;
 					/* render image */
 	if (blist.nb > 0) {
 		render_frame(blist.bl, blist.nb);
-		free((char *)blist.bl);
+		free((void *)blist.bl);
 	} else {
 		sprintf(errmsg, "no section visible in frame %d", fn);
 		error(WARNING, errmsg);
@@ -166,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;
 
@@ -178,8 +181,8 @@ int	nb;
 		bil[i].b = bl[i].bi;
 	}
 	hdloadbeams(bil, nb, pixBeam);
-	pixFinish(randflag);
-	free((char *)bil);
+	pixFinish(randfrac);
+	free((void *)bil);
 }
 
 
@@ -203,24 +206,24 @@ int	fn;
 				/* write header */
 	newheader("RADIANCE", stdout);
 	printf("SOFTWARE= %s\n", VersionID);
-	printf("%s %s\n", progname, hdkfile);
+	printargs(gargc, gargv, stdout);
 	if (fn)
 		printf("FRAME=%d\n", 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));
 }
 
 
@@ -228,17 +231,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;
 		}
@@ -259,11 +263,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);
@@ -281,7 +284,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, (long)nextloc, 0);
+		lseek(fd, (off_t)nextloc, 0);
 		read(fd, (char *)&nextloc, sizeof(nextloc));
 		hdinit(fd, NULL);
 	}
@@ -289,11 +292,12 @@ 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");
 }
 
 
+void
 eputs(s)			/* put error message to stderr */
 register char  *s;
 {