--- ray/src/px/oki20c.c	1989/10/20 16:44:34	1.6
+++ ray/src/px/oki20c.c	2003/06/05 19:29:34	2.12
@@ -1,36 +1,49 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: oki20c.c,v 2.12 2003/06/05 19:29:34 schorsch Exp $";
 #endif
-
 /*
  *  oki20c.c - program to dump pixel file to OkiMate 20 color printer.
- *
- *     6/10/87
  */
 
 #include  <stdio.h>
+#include  <time.h>
 
+#include  "platform.h"
 #include  "color.h"
+#include  "resolu.h"
 
+#define	 NROWS		1440		/* 10" at 144 dpi */
+#define	 NCOLS		960		/* 8" at 120 dpi */
 
-#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.
+ *  Subtractive primaries are ordered:	Yellow, Magenta, Cyan.
  */
 
-#define  sub_add(sub)	(2-(sub))	/* map subtractive to additive pri. */
+#define	 sub_add(sub)	(2-(sub))	/* map subtractive to additive pri. */
 
+long  lpat[NCOLS][3];
 
+int  dofilter = 0;		/* filter through pfilt first? */
+
+extern FILE  *popen();
+
+
 main(argc, argv)
 int  argc;
 char  *argv[];
 {
 	int  i, status = 0;
-	
+	SET_DEFAULT_BINARY();
+	SET_FILE_BINARY(stdin);
+	SET_FILE_BINARY(stdout);
+	if (argc > 1 && !strcmp(argv[1], "-p")) {
+		dofilter++;
+		argv++; argc--;
+	}
 	if (argc < 2)
 		status = printp(NULL) == -1;
 	else
@@ -43,12 +56,23 @@ 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) {
+			sprintf(buf, FILTER, "");
+			fname = "<stdin>";
+		} else
+			sprintf(buf, FILTER, fname);
+		if ((input = popen(buf, "r")) == NULL) {
+			fprintf(stderr, "Cannot execute: %s\n", buf);
+			return(-1);
+		}
+	} else if (fname == NULL) {
 		input = stdin;
 		fname = "<stdin>";
 	} else if ((input = fopen(fname, "r")) == NULL) {
@@ -56,13 +80,16 @@ 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);
 	}
-	if (xres > NCOLS || yres > NROWS) {
+	if (xres > NCOLS) {
 		fprintf(stderr, "%s: resolution mismatch\n", fname);
 		return(-1);
 	}
@@ -74,35 +101,26 @@ char  *fname;
 			fprintf(stderr, "%s: read error (y=%d)\n", fname, i);
 			return(-1);
 		}
-		normscan(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);
 }
 
 
-normscan(scan, len)			/* normalize a scanline */
-register COLR  scan[];
-int  len;
-{
-	register int  i;
-
-	for (i = 0; i < len; i++)
-		colr_norm(scan[i], scan[i]);
-}
-
-
 plotscan(scan, len, y)			/* plot a scanline */
 COLR  scan[];
 int  len;
 int  y;
 {
-	static long  pat[NCOLS][3];
 	int  bpos;
 	register long  c;
 	register int  i, j;
@@ -111,28 +129,35 @@ 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;
+		return;
+	}
+	fputs("\033\031", stdout);
 
-	} else {
-
-		fputs("\033\031", stdout);
-
-		for (j = 0; j < 3; j++) {
-			fputs("\033%O", stdout);
-			putchar(len & 255);
-			putchar(len >> 8);
-			for (i = 0; i < len; i++) {
-				c = pat[i][j] | colbit(scan[i],i,j);
-							/* repeat this row */
-				pat[i][j] = (c & 1) << 23;
-				putchar(c>>16);
-				putchar(c>>8 & 255);
-				putchar(c & 255);
-			}
-			putchar('\r');
+	for (j = 0; j < 3; j++) {
+		i = (NCOLS + len)/2;		/* center image */
+		fputs("\033%O", stdout);
+		putchar(i & 255);
+		putchar(i >> 8);
+		while (i-- > len) {
+			putchar(0);
+			putchar(0);
+			putchar(0);
 		}
-		putchar('\n');
+		for (i = 0; i < len; i++) {
+			c = lpat[i][j] | colbit(scan[i],i,j);
+			putchar((int)(c>>16));
+			putchar((int)(c>>8 & 255));
+			putchar((int)(c & 255));
+			if (y)			/* repeat this row */
+				lpat[i][j] = (c & 1) << 23;
+			else			/* or clear for next image */
+				lpat[i][j] = 0L;
+		}
+		putchar('\r');
 	}
+	putchar('\n');
+	fflush(stdout);
 }
 
 
@@ -143,14 +168,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);
 }