--- ray/src/px/pfilt.c	1993/11/18 09:56:17	2.12
+++ ray/src/px/pfilt.c	1996/02/14 20:19:52	2.16
@@ -1,4 +1,4 @@
-/* Copyright (c) 1992 Regents of the University of California */
+/* Copyright (c) 1996 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -92,7 +92,7 @@ char  **argv;
 	long  fpos;
 	double	outaspect = 0.0;
 	double	d;
-	int  i;
+	int  i, j;
 #ifdef MSDOS
 	extern int  _fmode;
 	_fmode = O_BINARY;
@@ -219,9 +219,9 @@ char  **argv;
 			fprintf(stderr, "%s: unknown lamp type\n", lamptype);
 			quit(1);
 		}
-		for (i = 0; i < 3; i++)
-			if (lampcolor[i] > 1e-4)
-				colval(exposure,i) /= lampcolor[i];
+		for (j = 0; j < 3; j++)
+			if (lampcolor[j] > 1e-4)
+				colval(exposure,j) /= lampcolor[j];
 		freelamps();
 	}
 					/* open input file */
@@ -302,6 +302,25 @@ char  **argv;
 }
 
 
+double
+rgb_bright(clr)
+COLOR  clr;
+{
+	return(bright(clr));
+}
+
+
+double
+xyz_bright(clr)
+COLOR  clr;
+{
+	return(clr[CIEY]);
+}
+
+
+double	(*ourbright)() = rgb_bright;
+
+
 headline(s)				/* process line from header */
 char  *s;
 {
@@ -310,11 +329,16 @@ char  *s;
 	fputs(s, stdout);		/* copy to output */
 	if (isaspect(s))		/* get aspect ratio */
 		inpaspect *= aspectval(s);
-	else if (isexpos(s))
+	else if (isexpos(s))		/* get exposure */
 		hotlvl *= exposval(s);
-	else if (isformat(s)) {
-		formatval(fmt, s);
-		wrongformat = strcmp(fmt, COLRFMT);
+	else if (formatval(fmt, s)) {	/* get format */
+		wrongformat = 0;
+		if (!strcmp(COLRFMT, fmt))
+			ourbright = rgb_bright;
+		else if (!strcmp(CIEFMT, fmt))
+			ourbright = xyz_bright;
+		else
+			wrongformat = !globmatch(PICFMT, fmt);
 	}
 }
 
@@ -383,7 +407,7 @@ FILE  *in;
 				if (freadscan(scanin[yread%barsize],
 						xres, in) < 0) {
 					fprintf(stderr,
-						"%s: bad read (y=%d)\n",
+						"%s: truncated input (y=%d)\n",
 						progname, yres-1-yread);
 					quit(1);
 				}
@@ -430,9 +454,9 @@ scan2init()			/* prepare scanline arrays */
 			rad *= (y_r + x_c)/2.0;
 
 		if (thresh > FTINY) {
-			xrad = CHECKRAD*THRESHRAD*rad/x_c + xbrad;
-			yrad = CHECKRAD*THRESHRAD*rad/y_r + ybrad;
 			orad = CHECKRAD*THRESHRAD*rad + 1;
+			xrad = orad/x_c + xbrad;
+			yrad = orad/y_r + ybrad;
 			obarsize = 2*orad + 1;
 		} else {
 			xrad = CHECKRAD*rad/x_c + 1;
@@ -475,7 +499,7 @@ scan2init()			/* prepare scanline arrays */
 			fputaspect(d, stdout);
 	}
 					/* record exposure */
-	d = bright(exposure);
+	d = (*ourbright)(exposure);
 	if (!FEQ(d,1.0))
 		fputexpos(d, stdout);
 					/* record color correction */
@@ -502,11 +526,11 @@ int  r;
 	int  ybot;
 	register int  c;
 					/* average input scanlines */
-	while (nextrow < r+orad && nextrow < nrows) {
+	while (nextrow <= r+orad && nextrow < nrows) {
 		ybot = (long)nextrow*yres/nrows;
 		for (c = 0; c < ncols; c++) {
 			dobox(ctmp, (int)((long)c*xres/ncols),ybot, c,nextrow);
-			greybar[nextrow%obarsize][c] = bright(ctmp);
+			greybar[nextrow%obarsize][c] = (*ourbright)(ctmp);
 		}
 					/* and zero output scanline */
 		bzero((char *)scoutbar[nextrow%obarsize], ncols*sizeof(COLOR));