--- ray/src/px/oki20c.c	1989/10/20 20:36:02	1.7
+++ ray/src/px/oki20c.c	1992/01/29 15:18:20	2.3
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -13,24 +13,42 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  <stdio.h>
 
 #include  "color.h"
+#include  "resolu.h"
 
-
 #define  NROWS		1440		/* 10" at 144 dpi */
 #define  NCOLS		960		/* 8" at 120 dpi */
 
+#define  ASPECT		(120./144.)	/* pixel aspect ratio */
+
+#define  FILTER		"pfilt -1 -x %d -y %d -p %f %s",NCOLS,NROWS,ASPECT
+
 /*
  *  Subtractive primaries are ordered:  Yellow, Magenta, Cyan.
  */
 
 #define  sub_add(sub)	(2-(sub))	/* map subtractive to additive pri. */
 
+#ifdef  BSD
+#define  clearlbuf()	bzero((char *)lpat, sizeof(lpat))
+#else
+#define  clearlbuf()	(void)memset((char *)lpat, 0, sizeof(lpat))
+#endif
 
+long  lpat[NCOLS][3];
+
+int  dofilter = 0;		/* filter through pfilt first? */
+
+
 main(argc, argv)
 int  argc;
 char  *argv[];
 {
 	int  i, status = 0;
 	
+	if (argc > 1 && !strcmp(argv[1], "-p")) {
+		dofilter++;
+		argv++; argc--;
+	}
 	if (argc < 2)
 		status = printp(NULL) == -1;
 	else
@@ -43,12 +61,22 @@ char  *argv[];
 printp(fname)				/* print a picture */
 char  *fname;
 {
+	char  buf[64];
 	FILE  *input;
 	int  xres, yres;
 	COLR  scanline[NCOLS];
 	int  i;
 
-	if (fname == NULL) {
+	if (dofilter) {
+		if (fname == NULL)
+			fname = "";
+		sprintf(buf, FILTER, fname);
+		if ((input = popen(buf, "r")) == NULL) {
+			fprintf(stderr, "Cannot execute: %s\n", buf);
+			return(-1);
+		}
+		fname = buf;
+	} else if (fname == NULL) {
 		input = stdin;
 		fname = "<stdin>";
 	} else if ((input = fopen(fname, "r")) == NULL) {
@@ -56,9 +84,12 @@ char  *fname;
 		return(-1);
 	}
 				/* discard header */
-	getheader(input, NULL);
+	if (checkheader(input, COLRFMT, NULL) < 0) {
+		fprintf(stderr, "%s: not a Radiance picture\n", fname);
+		return(-1);
+	}
 				/* get picture dimensions */
-	if (fgetresolu(&xres, &yres, input) != (YMAJOR|YDECR)) {
+	if (fgetresolu(&xres, &yres, input) < 0) {
 		fprintf(stderr, "%s: bad picture size\n", fname);
 		return(-1);
 	}
@@ -68,19 +99,27 @@ char  *fname;
 	}
 				/* set line spacing (overlap for knitting) */
 	fputs("\0333\042", stdout);
+				/* clear line buffer */
+	clearlbuf();
+#ifdef _IOLBF
+	stdout->_flag &= ~_IOLBF;
+#endif
 				/* put out scanlines */
 	for (i = yres-1; i >= 0; i--) {
 		if (freadcolrs(scanline, xres, input) < 0) {
 			fprintf(stderr, "%s: read error (y=%d)\n", fname, i);
 			return(-1);
 		}
-		normcolrs(scanline, xres);
+		normcolrs(scanline, xres, 0);
 		plotscan(scanline, xres, i);
 	}
 				/* advance page */
 	putchar('\f');
 	
-	fclose(input);
+	if (dofilter)
+		pclose(input);
+	else
+		fclose(input);
 
 	return(0);
 }
@@ -91,7 +130,6 @@ COLR  scan[];
 int  len;
 int  y;
 {
-	static long  pat[NCOLS][3];
 	int  bpos;
 	register long  c;
 	register int  i, j;
@@ -100,7 +138,7 @@ int  y;
 
 		for (j = 0; j < 3; j++)
 			for (i = 0; i < len; i++)
-				pat[i][j] |= (long)colbit(scan[i],i,j) << bpos;
+				lpat[i][j] |= (long)colbit(scan[i],i,j) << bpos;
 
 	} else {
 
@@ -111,9 +149,9 @@ int  y;
 			putchar(len & 255);
 			putchar(len >> 8);
 			for (i = 0; i < len; i++) {
-				c = pat[i][j] | colbit(scan[i],i,j);
+				c = lpat[i][j] | colbit(scan[i],i,j);
 							/* repeat this row */
-				pat[i][j] = (c & 1) << 23;
+				lpat[i][j] = (c & 1) << 23;
 				putchar(c>>16);
 				putchar(c>>8 & 255);
 				putchar(c & 255);
@@ -121,6 +159,7 @@ int  y;
 			putchar('\r');
 		}
 		putchar('\n');
+		fflush(stdout);
 	}
 }
 
@@ -132,14 +171,16 @@ int  s;
 {
 	static int  cerr[NCOLS][3];
 	static int  err[3];
-	int  b;
+	int  b, errp;
 	register int  a, ison;
 
 	a = sub_add(s);			/* use additive primary */
 	b = col[a];
+	errp = err[a];
 	err[a] += b + cerr[x][a];
 	ison = err[a] < 128;
 	if (!ison) err[a] -= 256;
-	cerr[x][a] = err[a] /= 2;
+	err[a] /= 3;
+	cerr[x][a] = err[a] + errp;
 	return(ison);
 }