--- ray/src/util/vwrays.c	2011/08/16 02:22:50	3.15
+++ ray/src/util/vwrays.c	2019/03/04 22:41:20	3.19
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: vwrays.c,v 3.15 2011/08/16 02:22:50 greg Exp $";
+static const char	RCSid[] = "$Id: vwrays.c,v 3.19 2019/03/04 22:41:20 greg Exp $";
 #endif
 /*
  * Compute rays corresponding to a given picture or view.
@@ -31,6 +31,10 @@ int	zfd = -1;
 
 int	fromstdin = 0;
 
+int	unbuffered = 0;
+
+int	repeatcnt = 1;
+
 char	*progname;
 
 
@@ -42,7 +46,7 @@ main(
 {
 	char	*err;
 	int	rval, getdim = 0;
-	register int	i;
+	int	i;
 
 	progname = argv[0];
 	if (argc < 2)
@@ -101,6 +105,9 @@ main(
 				exit(1);
 			}
 			break;
+		case 'c':			/* repeat count */
+			repeatcnt = atoi(argv[++i]);
+			break;
 		case 'p':			/* pixel aspect or jitter */
 			if (argv[i][2] == 'a')
 				pa = atof(argv[++i]);
@@ -112,6 +119,9 @@ main(
 		case 'i':			/* get pixels from stdin */
 			fromstdin = 1;
 			break;
+		case 'u':			/* unbuffered output */
+			unbuffered = 1;
+			break;
 		default:
 			goto userr;
 		}
@@ -151,7 +161,7 @@ main(
 	exit(0);
 userr:
 	fprintf(stderr,
-	"Usage: %s [ -i -f{a|f|d} | -d ] { view opts .. | picture [zbuf] }\n",
+	"Usage: %s [ -i -u -f{a|f|d} -c rept | -d ] { view opts .. | picture [zbuf] }\n",
 			progname);
 	exit(1);
 }
@@ -180,12 +190,18 @@ pix2rays(
 	RREAL	loc[2];
 	int	pp[2];
 	double	d;
-	register int	i;
+	int	i;
 
 	while (fscanf(fp, "%lf %lf", &px, &py) == 2) {
 		px += .5; py += .5;
 		loc[0] = px/rs.xr; loc[1] = py/rs.yr;
 		if (zfd >= 0) {
+			if ((loc[0] < 0) | (loc[0] >= 1) |
+					(loc[1] < 0) | (loc[1] >= 1)) {
+				fprintf(stderr, "%s: input pixel outside image\n",
+						progname);
+				exit(1);
+			}
 			loc2pix(pp, &rs, loc[0], loc[1]);
 			if (lseek(zfd,
 				(pp[1]*scanlen(&rs)+pp[0])*sizeof(float),
@@ -211,6 +227,8 @@ pix2rays(
 			rdir[0] *= d; rdir[1] *= d; rdir[2] *= d;
 		}
 		(*putr)(rorg, rdir);
+		if (unbuffered)
+			fflush(stdout);
 	}
 	if (!feof(fp)) {
 		fprintf(stderr, "%s: expected px py on input\n", progname);
@@ -227,7 +245,7 @@ putrays(void)
 	float	*zbuf = NULL;
 	int	sc;
 	double	d;
-	register int	si, i;
+	int	si, i, c;
 
 	if (zfd >= 0) {
 		zbuf = (float *)malloc(scanlen(&rs)*sizeof(float));
@@ -246,6 +264,7 @@ putrays(void)
 			}
 		}
 		for (si = 0; si < scanlen(&rs); si++) {
+		    for (c = repeatcnt; c-- > 0; ) {
 			pix2loc(loc, &rs, si, sc);
 			jitterloc(loc);
 			d = viewray(rorg, rdir, &vw, loc[0], loc[1]);
@@ -261,6 +280,7 @@ putrays(void)
 				rdir[0] *= d; rdir[1] *= d; rdir[2] *= d;
 			}
 			(*putr)(rorg, rdir);
+		    }
 		}
 	}
 	if (zfd >= 0)
@@ -290,7 +310,7 @@ putf(		/* put out ray in float format */
 
 	v[0] = ro[0]; v[1] = ro[1]; v[2] = ro[2];
 	v[3] = rd[0]; v[4] = rd[1]; v[5] = rd[2];
-	fwrite(v, sizeof(float), 6, stdout);
+	putbinary(v, sizeof(float), 6, stdout);
 }
 
 
@@ -304,5 +324,5 @@ putd(		/* put out ray in double format */
 
 	v[0] = ro[0]; v[1] = ro[1]; v[2] = ro[2];
 	v[3] = rd[0]; v[4] = rd[1]; v[5] = rd[2];
-	fwrite(v, sizeof(double), 6, stdout);
+	putbinary(v, sizeof(double), 6, stdout);
 }