--- ray/src/util/glareval.c	2006/05/29 16:47:54	2.12
+++ ray/src/util/glareval.c	2020/05/14 20:58:03	2.18
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: glareval.c,v 2.12 2006/05/29 16:47:54 greg Exp $";
+static const char	RCSid[] = "$Id: glareval.c,v 2.18 2020/05/14 20:58:03 greg Exp $";
 #endif
 /*
  * Compute pixels for glare calculation
@@ -10,6 +10,7 @@ static const char	RCSid[] = "$Id: glareval.c,v 2.12 20
 #include <stdlib.h>
 #include <string.h>
 
+#include "platform.h"
 #include "rtprocess.h" /* Windows: must come first because of conflicts */
 #include "glare.h"
 
@@ -176,9 +177,7 @@ pict_val(			/* find picture value for view direction *
 	pp[0] = pictview.vp[0] + vd[0];
 	pp[1] = pictview.vp[1] + vd[1];
 	pp[2] = pictview.vp[2] + vd[2];
-	viewloc(ip, &pictview, pp);
-	if (ip[2] <= FTINY || ip[0] < 0. || ip[0] >= 1. ||
-			ip[1] < 0. || ip[1] >= 1.)
+	if (viewloc(ip, &pictview, pp) != VL_GOOD)
 		return(-1.0);
 	colr_color(res, getpictscan((int)(ip[1]*pysiz))[(int)(ip[0]*pxsiz)]);
 	return(luminance(res)/exposure);
@@ -200,7 +199,7 @@ getviewpix(		/* compute single view pixel */
 	npixinvw++;
 	if ((res = pict_val(dir)) >= 0.0)
 		return(res);
-	if (rt_pd.r == -1) {
+	if (!(rt_pd.flags & PF_RUNNING)) {
 		npixmiss++;
 		return(-1.0);
 	}
@@ -241,15 +240,17 @@ getviewspan(		/* compute a span of view pixels */
 		npixinvw++;
 		if ((vb[vh+hsize] = pict_val(dir)) >= 0.0)
 			continue;
-		if (rt_pd.r == -1) {		/* missing information */
+		if (!(rt_pd.flags & PF_RUNNING)) {	/* missing information */
 			npixmiss++;
 			continue;
 		}
 						/* send to rtrace */
 		if (n >= maxpix) {			/* flush */
 			rt_compute(rt_buf, n);
-			while (n-- > 0)
+			while (n > 0) {
+				--n;
 				vb[buf_vh[n]+hsize] = luminance(rt_buf+3*n);
+			}
 		}
 		rt_buf[6*n] = ourview.vp[0];
 		rt_buf[6*n+1] = ourview.vp[1];
@@ -298,7 +299,7 @@ getexpos(			/* get exposure from header line */
 	void	*p
 )
 {
-	char	fmt[32];
+	char	fmt[MAXFMTLEN];
 
 	if (isexpos(s))
 		exposure *= exposval(s);
@@ -319,6 +320,7 @@ open_pict(			/* open picture file */
 		fprintf(stderr, "%s: cannot open\n", fn);
 		exit(1);
 	}
+	SET_FILE_BINARY(pictfp);
 	exposure = 1.0;
 	getheader(pictfp, getexpos, NULL);
 	if (wrongformat || !fscnresolu(&pxsiz, &pysiz, pictfp)) {
@@ -374,7 +376,6 @@ done_rtrace(void)			/* wait for rtrace to finish */
 				progname, status);
 		exit(1);
 	}
-	rt_pd.r = -1;
 }