--- ray/src/util/glareval.c	1991/04/05 14:41:55	1.10
+++ ray/src/util/glareval.c	1991/04/18 15:18:25	1.13
@@ -20,7 +20,7 @@ static char SCCSid[] = "$SunId$ LBL";
 #define vfork		fork
 #endif
 
-#define MAXSBUF		1023980	/* maximum total size of scanline buffer */
+#define MAXSBUF		524268	/* maximum total size of scanline buffer */
 #define HSIZE		317	/* size of scanline hash table */
 #define NRETIRE		16	/* number of scanlines to retire at once */
 
@@ -50,6 +50,8 @@ static SCAN	*hashtab[HSIZE];	/* scanline hash table */
 static long	ncall = 0L;	/* number of calls to getpictscan */
 static long	nread = 0L;	/* number of scanlines read */
 
+static int	wrongformat = 0;
+
 SCAN	*scanretire();
 
 extern long	ftell();
@@ -75,6 +77,12 @@ int	y;
 			if (sl->y == y) {		/* reclaim */
 				sl->next = hashtab[hi];
 				hashtab[hi] = sl;
+#ifdef DEBUG
+				if (verbose)
+					fprintf(stderr,
+						"%s: scanline %d reclaimed\n",
+							progname, y);
+#endif
 			}
 			return(sl);
 		}
@@ -171,14 +179,15 @@ FVECT	vd;
 
 
 double
-getviewpix(vh, vv)		/* compute single view pixel */
+getviewpix(vh, vv, se)		/* compute single view pixel */
 int	vh, vv;
+SPANERR	*se;
 {
 	FVECT	dir;
 	float	rt_buf[6];
 	double	res;
 
-	if (compdir(dir, vh, vv) < 0)
+	if (compdir(dir, vh, vv, se) < 0)
 		return(-1.0);
 	npixinvw++;
 	if ((res = pict_val(dir)) >= 0.0)
@@ -205,6 +214,7 @@ float	*vb;
 	float	rt_buf[6*MAXPIX];	/* rtrace send/receive buffer */
 	register int	n;		/* number of pixels in buffer */
 	short	buf_vh[MAXPIX];		/* pixel positions */
+	SPANERR	sperr;
 	FVECT	dir;
 	register int	vh;
 
@@ -213,9 +223,10 @@ float	*vb;
 		fprintf(stderr, "%s: computing view span at %d...\n",
 				progname, vv);
 #endif
+	setspanerr(&sperr, vv);
 	n = 0;
 	for (vh = -hsize; vh <= hsize; vh++) {
-		if (compdir(dir, vh, vv) < 0) {	/* off viewable region */
+		if (compdir(dir, vh, vv, &sperr) < 0) {	/* not in view */
 			vb[vh+hsize] = -1.0;
 			continue;
 		}
@@ -281,24 +292,29 @@ int	np;
 getexpos(s)			/* get exposure from header line */
 char	*s;
 {
+	char	fmt[32];
+
 	if (isexpos(s))
 		exposure *= exposval(s);
+	else if (isformat(s)) {
+		formatval(fmt, s);
+		wrongformat = strcmp(fmt, COLRFMT);
+	}
 }
 
 
 open_pict(fn)			/* open picture file */
 char	*fn;
 {
-	register int	i;
-
 	if ((pictfp = fopen(fn, "r")) == NULL) {
 		fprintf("%s: cannot open\n", fn);
 		exit(1);
 	}
 	exposure = 1.0;
-	getheader(pictfp, getexpos);
-	if (fgetresolu(&pxsiz, &pysiz, pictfp) != (YMAJOR|YDECR)) {
-		fprintf("%s: bad picture resolution\n", fn);
+	getheader(pictfp, getexpos, NULL);
+	if (wrongformat ||
+			fgetresolu(&pxsiz, &pysiz, pictfp) != (YMAJOR|YDECR)) {
+		fprintf("%s: bad picture format\n", fn);
 		exit(1);
 	}
 	initscans();
@@ -307,8 +323,6 @@ char	*fn;
 
 close_pict()			/* done with picture */
 {
-	register int	i;
-
 	if (pictfp == NULL)
 		return;
 	fclose(pictfp);