--- ray/src/px/oki20c.c	1991/11/11 14:01:31	1.12
+++ ray/src/px/oki20c.c	1992/01/29 16:51:40	2.4
@@ -18,6 +18,10 @@ static char SCCSid[] = "$SunId$ LBL";
 #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.
  */
@@ -32,13 +36,19 @@ static char SCCSid[] = "$SunId$ LBL";
 
 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
@@ -51,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) {
@@ -81,6 +101,9 @@ char  *fname;
 	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) {
@@ -93,7 +116,10 @@ char  *fname;
 				/* advance page */
 	putchar('\f');
 	
-	fclose(input);
+	if (dofilter)
+		pclose(input);
+	else
+		fclose(input);
 
 	return(0);
 }
@@ -119,9 +145,15 @@ int  y;
 		fputs("\033\031", stdout);
 
 		for (j = 0; j < 3; j++) {
+			i = (NCOLS + len)/2;		/* center image */
 			fputs("\033%O", stdout);
-			putchar(len & 255);
-			putchar(len >> 8);
+			putchar(i & 255);
+			putchar(i >> 8);
+			while (i-- > len) {
+				putchar(0);
+				putchar(0);
+				putchar(0);
+			}
 			for (i = 0; i < len; i++) {
 				c = lpat[i][j] | colbit(scan[i],i,j);
 							/* repeat this row */
@@ -133,6 +165,7 @@ int  y;
 			putchar('\r');
 		}
 		putchar('\n');
+		fflush(stdout);
 	}
 }
 
@@ -143,17 +176,17 @@ register int  x;
 int  s;
 {
 	static int  cerr[NCOLS][3];
-	static int  err[3], errp[3];
-	int  b;
+	static int  err[3];
+	int  b, errp;
 	register int  a, ison;
 
 	a = sub_add(s);			/* use additive primary */
 	b = col[a];
-	errp[a] = err[a];
+	errp = err[a];
 	err[a] += b + cerr[x][a];
 	ison = err[a] < 128;
 	if (!ison) err[a] -= 256;
 	err[a] /= 3;
-	cerr[x][a] = err[a] + errp[a];
+	cerr[x][a] = err[a] + errp;
 	return(ison);
 }