--- ray/src/px/pvalue.c	1994/02/27 10:16:48	2.8
+++ ray/src/px/pvalue.c	1998/10/27 09:08:27	2.13
@@ -18,6 +18,12 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #define	 min(a,b)		((a)<(b)?(a):(b))
 
+				/* what to put out (also RED, GRN, BLU) */
+#define  ALL		3
+#define  BRIGHT		4
+
+#define  brightonly	(putprim==BRIGHT)
+
 RESOLU	picres;			/* resolution of picture */
 
 int  uniq = 0;			/* print only unique values? */
@@ -26,7 +32,7 @@ int  doexposure = 0;		/* exposure change? (>100 to pri
 
 int  dataonly = 0;		/* data only format? */
 
-int  brightonly = 0;		/* only brightness values? */
+int  putprim = ALL;		/* what to put out */
 
 int  reverse = 0;		/* reverse conversion? */
 
@@ -35,6 +41,10 @@ char  *fmtid = "ascii";		/* format identifier for head
 
 int  header = 1;		/* do header? */
 
+long  skipbytes = 0;		/* skip bytes in input? */
+
+int  interleave = 1;		/* file is interleaved? */
+
 int  resolution = 1;		/* put/get resolution string? */
 
 int  original = 0;		/* convert to original values? */
@@ -51,6 +61,7 @@ COLOR  exposure = WHTCOLOR;
 char  *progname;
 
 FILE  *fin;
+FILE  *fin2 = NULL, *fin3 = NULL;	/* for other color channels */
 
 int  (*getval)(), (*putval)();
 
@@ -60,6 +71,7 @@ int  argc;
 char  **argv;
 {
 	extern int  checkhead();
+	extern long  atol();
 	double  d, expval = 1.0;
 	int  i;
 
@@ -74,6 +86,9 @@ char  **argv;
 			case 'H':		/* resolution string */
 				resolution = argv[i][0] == '+';
 				break;
+			case 's':		/* skip bytes in header */
+				skipbytes = atol(argv[++i]);
+				break;
 			case 'u':		/* unique values */
 				uniq = argv[i][0] == '-';
 				break;
@@ -91,9 +106,8 @@ char  **argv;
 				if (argv[i+1][0] == '-' || argv[i+1][0] == '+')
 					d = pow(2.0, d);
 				if (argv[i][0] == '-')
-					doexposure = 100;
+					expval *= d;
 				scalecolor(exposure, d);
-				expval *= d;
 				doexposure++;
 				i++;
 				break;
@@ -107,9 +121,20 @@ char  **argv;
 			case 'r':		/* reverse conversion */
 				reverse = argv[i][0] == '-';
 				break;
+			case 'n':		/* non-interleaved RGB */
+				interleave = argv[i][0] == '+';
+				break;
 			case 'b':		/* brightness values */
-				brightonly = argv[i][0] == '-';
+				putprim = argv[i][0] == '-' ? BRIGHT : ALL;
 				break;
+			case 'p':		/* put primary */
+				switch (argv[i][2]) {
+				case 'r': case 'R': putprim = RED; break;
+				case 'g': case 'G': putprim = GRN; break;
+				case 'b': case 'B': putprim = BLU; break;
+				default: goto unkopt;
+				}
+				break;
 			case 'd':		/* data only (no indices) */
 				dataonly = argv[i][0] == '-';
 				switch (argv[i][2]) {
@@ -179,19 +204,43 @@ unkopt:
 					/* get input */
 	if (i == argc) {
 		fin = stdin;
-	} else if (i == argc-1) {
+	} else if (i < argc) {
 		if ((fin = fopen(argv[i], "r")) == NULL) {
 			fprintf(stderr, "%s: can't open file \"%s\"\n",
 						progname, argv[i]);
 			quit(1);
 		}
-	} else {
+		if (reverse && !brightonly && i == argc-3) {
+			if ((fin2 = fopen(argv[i+1], "r")) == NULL) {
+				fprintf(stderr, "%s: can't open file \"%s\"\n",
+						progname, argv[i+1]);
+				quit(1);
+			}
+			if ((fin3 = fopen(argv[i+2], "r")) == NULL) {
+				fprintf(stderr, "%s: can't open file \"%s\"\n",
+						progname, argv[i+2]);
+				quit(1);
+			}
+			interleave = -1;
+		} else if (i != argc-1)
+			fin = NULL;
+		if (reverse && !brightonly && !interleave) {
+			fin2 = fopen(argv[i], "r");
+			fin3 = fopen(argv[i], "r");
+		}
+		if (skipbytes && (fseek(fin, skipbytes, 0) || (fin2 != NULL &&
+				(fseek(fin2, skipbytes, 0) ||
+				fseek(fin3, skipbytes, 0))))) {
+			fprintf(stderr, "%s: cannot skip %ld bytes on input\n",
+					progname, skipbytes);
+			quit(1);
+		}
+	}
+	if (fin == NULL) {
 		fprintf(stderr, "%s: bad # file arguments\n", progname);
 		quit(1);
 	}
 
-	set_io();
-
 	if (reverse) {
 #ifdef MSDOS
 		setmode(fileno(stdout), O_BINARY);
@@ -205,6 +254,10 @@ unkopt:
 						progname);
 				quit(1);
 			}
+			if (fin2 != NULL) {
+				getheader(fin2, NULL, NULL);
+				getheader(fin3, NULL, NULL);
+			}
 		} else
 			newheader("RADIANCE", stdout);
 					/* get resolution */
@@ -213,9 +266,24 @@ unkopt:
 			fprintf(stderr, "%s: missing resolution\n", progname);
 			quit(1);
 		}
+		if (resolution && fin2 != NULL) {
+			RESOLU  pres2;
+			if (!fgetsresolu(&pres2, fin2) ||
+					pres2.or != picres.or ||
+					pres2.xr != picres.xr ||
+					pres2.yr != picres.yr ||
+					!fgetsresolu(&pres2, fin3) ||
+					pres2.or != picres.or ||
+					pres2.xr != picres.xr ||
+					pres2.yr != picres.yr) {
+				fprintf(stderr, "%s: resolution mismatch\n",
+						progname);
+				quit(1);
+			}
+		}
 						/* add to header */
 		printargs(i, argv, stdout);
-		if (doexposure > 100)
+		if (expval < .99 || expval > 1.01)
 			fputexpos(expval, stdout);
 		fputformat(COLRFMT, stdout);
 		putchar('\n');
@@ -240,7 +308,7 @@ unkopt:
 		}
 		if (header) {
 			printargs(i, argv, stdout);
-			if (doexposure > 100)
+			if (expval < .99 || expval > 1.01)
 				fputexpos(expval, stdout);
 			fputformat(fmtid, stdout);
 			putchar('\n');
@@ -254,6 +322,7 @@ unkopt:
 }
 
 
+int
 checkhead(line)				/* deal with line from header */
 char  *line;
 {
@@ -275,6 +344,7 @@ char  *line;
 		doexposure++;
 	} else if (header)
 		fputs(line, stdout);
+	return(0);
 }
 
 
@@ -284,6 +354,8 @@ pixtoval()				/* convert picture to values */
 	int  dogamma;
 	COLOR  lastc;
 	FLOAT  hv[2];
+	int  startprim, endprim;
+	long  startpos;
 	int  y;
 	register int  x;
 
@@ -293,39 +365,55 @@ pixtoval()				/* convert picture to values */
 		quit(1);
 	}
 	dogamma = gamcor < .95 || gamcor > 1.05;
-	setcolor(lastc, 0.0, 0.0, 0.0);
-	for (y = 0; y < numscans(&picres); y++) {
-		if (freadscan(scanln, scanlen(&picres), fin) < 0) {
-			fprintf(stderr, "%s: read error\n", progname);
+	if (putprim == ALL && !interleave) {
+		startprim = RED; endprim = BLU;
+		startpos = ftell(fin);
+	} else {
+		startprim = putprim; endprim = putprim;
+	}
+	for (putprim = startprim; putprim <= endprim; putprim++) {
+		if (putprim != startprim && fseek(fin, startpos, 0)) {
+			fprintf(stderr, "%s: seek error on input file\n",
+					progname);
 			quit(1);
 		}
-		for (x = 0; x < scanlen(&picres); x++) {
-			if (uniq)
-				if (	colval(scanln[x],RED) ==
-						colval(lastc,RED) &&
-					colval(scanln[x],GRN) ==
-						colval(lastc,GRN) &&
-					colval(scanln[x],BLU) ==
-						colval(lastc,BLU)	)
-					continue;
-				else
-					copycolor(lastc, scanln[x]);
-			if (doexposure)
-				multcolor(scanln[x], exposure);
-			if (dogamma)
-				setcolor(scanln[x],
-				pow(colval(scanln[x],RED), 1.0/gamcor),
-				pow(colval(scanln[x],GRN), 1.0/gamcor),
-				pow(colval(scanln[x],BLU), 1.0/gamcor));
-			if (!dataonly) {
-				pix2loc(hv, &picres, x, y);
-				printf("%7d %7d ", (int)(hv[0]*picres.xr),
-						(int)(hv[1]*picres.yr));
-			}
-			if ((*putval)(scanln[x], stdout) < 0) {
-				fprintf(stderr, "%s: write error\n", progname);
+		set_io();
+		setcolor(lastc, 0.0, 0.0, 0.0);
+		for (y = 0; y < numscans(&picres); y++) {
+			if (freadscan(scanln, scanlen(&picres), fin) < 0) {
+				fprintf(stderr, "%s: read error\n", progname);
 				quit(1);
 			}
+			for (x = 0; x < scanlen(&picres); x++) {
+				if (uniq)
+					if (	colval(scanln[x],RED) ==
+							colval(lastc,RED) &&
+						colval(scanln[x],GRN) ==
+							colval(lastc,GRN) &&
+						colval(scanln[x],BLU) ==
+							colval(lastc,BLU)	)
+						continue;
+					else
+						copycolor(lastc, scanln[x]);
+				if (doexposure)
+					multcolor(scanln[x], exposure);
+				if (dogamma)
+					setcolor(scanln[x],
+					pow(colval(scanln[x],RED), 1.0/gamcor),
+					pow(colval(scanln[x],GRN), 1.0/gamcor),
+					pow(colval(scanln[x],BLU), 1.0/gamcor));
+				if (!dataonly) {
+					pix2loc(hv, &picres, x, y);
+					printf("%7d %7d ",
+							(int)(hv[0]*picres.xr),
+							(int)(hv[1]*picres.yr));
+				}
+				if ((*putval)(scanln[x]) < 0) {
+					fprintf(stderr, "%s: write error\n",
+							progname);
+					quit(1);
+				}
+			}
 		}
 	}
 	free((char *)scanln);
@@ -345,11 +433,17 @@ valtopix()			/* convert values to a pixel file */
 		quit(1);
 	}
 	dogamma = gamcor < .95 || gamcor > 1.05;
+	set_io();
 	for (y = 0; y < numscans(&picres); y++) {
 		for (x = 0; x < scanlen(&picres); x++) {
-			if (!dataonly)
+			if (!dataonly) {
 				fscanf(fin, "%*d %*d");
-			if ((*getval)(scanln[x], fin) < 0) {
+				if (fin2 != NULL) {
+					fscanf(fin2, "%*d %*d");
+					fscanf(fin3, "%*d %*d");
+				}
+			}
+			if ((*getval)(scanln[x]) < 0) {
 				fprintf(stderr, "%s: read error\n", progname);
 				quit(1);
 			}
@@ -377,120 +471,146 @@ int  code;
 }
 
 
-getcascii(col, fp)		/* get an ascii color value from fp */
+getcascii(col)		/* get an ascii color value from stream(s) */
 COLOR  col;
-FILE  *fp;
 {
 	double	vd[3];
 
-	if (fscanf(fp, "%lf %lf %lf", &vd[0], &vd[1], &vd[2]) != 3)
-		return(-1);
+	if (fin2 == NULL) {
+		if (fscanf(fin, "%lf %lf %lf", &vd[0], &vd[1], &vd[2]) != 3)
+			return(-1);
+	} else {
+		if (fscanf(fin, "%lf", &vd[0]) != 1 ||
+				fscanf(fin2, "%lf", &vd[1]) != 1 ||
+				fscanf(fin3, "%lf", &vd[2]) != 1)
+			return(-1);
+	}
 	setcolor(col, vd[rord[RED]], vd[rord[GRN]], vd[rord[BLU]]);
 	return(0);
 }
 
 
-getcdouble(col, fp)		/* get a double color value from fp */
+getcdouble(col)		/* get a double color value from stream(s) */
 COLOR  col;
-FILE  *fp;
 {
 	double	vd[3];
 
-	if (fread((char *)vd, sizeof(double), 3, fp) != 3)
-		return(-1);
+	if (fin2 == NULL) {
+		if (fread((char *)vd, sizeof(double), 3, fin) != 3)
+			return(-1);
+	} else {
+		if (fread((char *)vd, sizeof(double), 1, fin) != 1 ||
+			fread((char *)(vd+1), sizeof(double), 1, fin2) != 1 ||
+			fread((char *)(vd+2), sizeof(double), 1, fin3) != 1)
+			return(-1);
+	}
 	setcolor(col, vd[rord[RED]], vd[rord[GRN]], vd[rord[BLU]]);
 	return(0);
 }
 
 
-getcfloat(col, fp)		/* get a float color value from fp */
+getcfloat(col)		/* get a float color value from stream(s) */
 COLOR  col;
-FILE  *fp;
 {
 	float  vf[3];
 
-	if (fread((char *)vf, sizeof(float), 3, fp) != 3)
-		return(-1);
+	if (fin2 == NULL) {
+		if (fread((char *)vf, sizeof(float), 3, fin) != 3)
+			return(-1);
+	} else {
+		if (fread((char *)vf, sizeof(float), 1, fin) != 1 ||
+			fread((char *)(vf+1), sizeof(float), 1, fin2) != 1 ||
+			fread((char *)(vf+2), sizeof(float), 1, fin3) != 1)
+			return(-1);
+	}
 	setcolor(col, vf[rord[RED]], vf[rord[GRN]], vf[rord[BLU]]);
 	return(0);
 }
 
 
-getcint(col, fp)		/* get an int color value from fp */
+getcint(col)		/* get an int color value from stream(s) */
 COLOR  col;
-FILE  *fp;
 {
 	int  vi[3];
 
-	if (fscanf(fp, "%d %d %d", &vi[0], &vi[1], &vi[2]) != 3)
-		return(-1);
+	if (fin2 == NULL) {
+		if (fscanf(fin, "%d %d %d", &vi[0], &vi[1], &vi[2]) != 3)
+			return(-1);
+	} else {
+		if (fscanf(fin, "%d", &vi[0]) != 1 ||
+				fscanf(fin2, "%d", &vi[1]) != 1 ||
+				fscanf(fin3, "%d", &vi[2]) != 1)
+			return(-1);
+	}
 	setcolor(col, (vi[rord[RED]]+.5)/256.,
 			(vi[rord[GRN]]+.5)/256., (vi[rord[BLU]]+.5)/256.);
 	return(0);
 }
 
 
-getcbyte(col, fp)		/* get a byte color value from fp */
+getcbyte(col)		/* get a byte color value from stream(s) */
 COLOR  col;
-FILE  *fp;
 {
 	BYTE  vb[3];
 
-	if (fread((char *)vb, sizeof(BYTE), 3, fp) != 3)
-		return(-1);
+	if (fin2 == NULL) {
+		if (fread((char *)vb, sizeof(BYTE), 3, fin) != 3)
+			return(-1);
+	} else {
+		if (fread((char *)vb, sizeof(BYTE), 1, fin) != 1 ||
+			fread((char *)(vb+1), sizeof(BYTE), 1, fin2) != 1 ||
+			fread((char *)(vb+2), sizeof(BYTE), 1, fin3) != 1)
+			return(-1);
+	}
 	setcolor(col, (vb[rord[RED]]+.5)/256.,
 			(vb[rord[GRN]]+.5)/256., (vb[rord[BLU]]+.5)/256.);
 	return(0);
 }
 
 
-getbascii(col, fp)		/* get an ascii brightness value from fp */
+getbascii(col)		/* get an ascii brightness value from fin */
 COLOR  col;
-FILE  *fp;
 {
 	double	vd;
 
-	if (fscanf(fp, "%lf", &vd) != 1)
+	if (fscanf(fin, "%lf", &vd) != 1)
 		return(-1);
 	setcolor(col, vd, vd, vd);
 	return(0);
 }
 
 
-getbdouble(col, fp)		/* get a double brightness value from fp */
+getbdouble(col)		/* get a double brightness value from fin */
 COLOR  col;
-FILE  *fp;
 {
 	double	vd;
 
-	if (fread((char *)&vd, sizeof(double), 1, fp) != 1)
+	if (fread((char *)&vd, sizeof(double), 1, fin) != 1)
 		return(-1);
 	setcolor(col, vd, vd, vd);
 	return(0);
 }
 
 
-getbfloat(col, fp)		/* get a float brightness value from fp */
+getbfloat(col)		/* get a float brightness value from fin */
 COLOR  col;
-FILE  *fp;
 {
 	float  vf;
 
-	if (fread((char *)&vf, sizeof(float), 1, fp) != 1)
+	if (fread((char *)&vf, sizeof(float), 1, fin) != 1)
 		return(-1);
 	setcolor(col, vf, vf, vf);
 	return(0);
 }
 
 
-getbint(col, fp)		/* get an int brightness value from fp */
+getbint(col)		/* get an int brightness value from fin */
 COLOR  col;
-FILE  *fp;
 {
 	int  vi;
 	double	d;
 
-	if (fscanf(fp, "%d", &vi) != 1)
+	if (fscanf(fin, "%d", &vi) != 1)
 		return(-1);
 	d = (vi+.5)/256.;
 	setcolor(col, d, d, d);
@@ -498,14 +618,13 @@ FILE  *fp;
 }
 
 
-getbbyte(col, fp)		/* get a byte brightness value from fp */
+getbbyte(col)		/* get a byte brightness value from fin */
 COLOR  col;
-FILE  *fp;
 {
 	BYTE  vb;
 	double	d;
 
-	if (fread((char *)&vb, sizeof(BYTE), 1, fp) != 1)
+	if (fread((char *)&vb, sizeof(BYTE), 1, fin) != 1)
 		return(-1);
 	d = (vb+.5)/256.;
 	setcolor(col, d, d, d);
@@ -513,65 +632,60 @@ FILE  *fp;
 }
 
 
-putcascii(col, fp)			/* put an ascii color to fp */
+putcascii(col)			/* put an ascii color to stdout */
 COLOR  col;
-FILE  *fp;
 {
-	fprintf(fp, "%15.3e %15.3e %15.3e\n",
+	fprintf(stdout, "%15.3e %15.3e %15.3e\n",
 			colval(col,ord[0]),
 			colval(col,ord[1]),
 			colval(col,ord[2]));
 
-	return(ferror(fp) ? -1 : 0);
+	return(ferror(stdout) ? -1 : 0);
 }
 
 
-putcfloat(col, fp)			/* put a float color to fp */
+putcfloat(col)			/* put a float color to stdout */
 COLOR  col;
-FILE  *fp;
 {
 	float  vf[3];
 
 	vf[0] = colval(col,ord[0]);
 	vf[1] = colval(col,ord[1]);
 	vf[2] = colval(col,ord[2]);
-	fwrite((char *)vf, sizeof(float), 3, fp);
+	fwrite((char *)vf, sizeof(float), 3, stdout);
 
-	return(ferror(fp) ? -1 : 0);
+	return(ferror(stdout) ? -1 : 0);
 }
 
 
-putcdouble(col, fp)			/* put a double color to fp */
+putcdouble(col)			/* put a double color to stdout */
 COLOR  col;
-FILE  *fp;
 {
 	double	vd[3];
 
 	vd[0] = colval(col,ord[0]);
 	vd[1] = colval(col,ord[1]);
 	vd[2] = colval(col,ord[2]);
-	fwrite((char *)vd, sizeof(double), 3, fp);
+	fwrite((char *)vd, sizeof(double), 3, stdout);
 
-	return(ferror(fp) ? -1 : 0);
+	return(ferror(stdout) ? -1 : 0);
 }
 
 
-putcint(col, fp)			/* put an int color to fp */
+putcint(col)			/* put an int color to stdout */
 COLOR  col;
-FILE  *fp;
 {
-	fprintf(fp, "%d %d %d\n",
+	fprintf(stdout, "%d %d %d\n",
 			(int)(colval(col,ord[0])*256.),
 			(int)(colval(col,ord[1])*256.),
 			(int)(colval(col,ord[2])*256.));
 
-	return(ferror(fp) ? -1 : 0);
+	return(ferror(stdout) ? -1 : 0);
 }
 
 
-putcbyte(col, fp)			/* put a byte color to fp */
+putcbyte(col)			/* put a byte color to stdout */
 COLOR  col;
-FILE  *fp;
 {
 	register int  i;
 	BYTE  vb[3];
@@ -582,120 +696,239 @@ FILE  *fp;
 	vb[1] = min(i,255);
 	i = colval(col,ord[2])*256.;
 	vb[2] = min(i,255);
-	fwrite((char *)vb, sizeof(BYTE), 3, fp);
+	fwrite((char *)vb, sizeof(BYTE), 3, stdout);
 
-	return(ferror(fp) ? -1 : 0);
+	return(ferror(stdout) ? -1 : 0);
 }
 
 
-putbascii(col, fp)			/* put an ascii brightness to fp */
+putbascii(col)			/* put an ascii brightness to stdout */
 COLOR  col;
-FILE  *fp;
 {
-	fprintf(fp, "%15.3e\n", bright(col));
+	fprintf(stdout, "%15.3e\n", bright(col));
 
-	return(ferror(fp) ? -1 : 0);
+	return(ferror(stdout) ? -1 : 0);
 }
 
 
-putbfloat(col, fp)			/* put a float brightness to fp */
+putbfloat(col)			/* put a float brightness to stdout */
 COLOR  col;
-FILE  *fp;
 {
 	float  vf;
 
 	vf = bright(col);
-	fwrite((char *)&vf, sizeof(float), 1, fp);
+	fwrite((char *)&vf, sizeof(float), 1, stdout);
 
-	return(ferror(fp) ? -1 : 0);
+	return(ferror(stdout) ? -1 : 0);
 }
 
 
-putbdouble(col, fp)			/* put a double brightness to fp */
+putbdouble(col)			/* put a double brightness to stdout */
 COLOR  col;
-FILE  *fp;
 {
 	double	vd;
 
 	vd = bright(col);
-	fwrite((char *)&vd, sizeof(double), 1, fp);
+	fwrite((char *)&vd, sizeof(double), 1, stdout);
 
-	return(ferror(fp) ? -1 : 0);
+	return(ferror(stdout) ? -1 : 0);
 }
 
 
-putbint(col, fp)			/* put an int brightness to fp */
+putbint(col)			/* put an int brightness to stdout */
 COLOR  col;
-FILE  *fp;
 {
-	fprintf(fp, "%d\n", (int)(bright(col)*256.));
+	fprintf(stdout, "%d\n", (int)(bright(col)*256.));
 
-	return(ferror(fp) ? -1 : 0);
+	return(ferror(stdout) ? -1 : 0);
 }
 
 
-putbbyte(col, fp)			/* put a byte brightness to fp */
+putbbyte(col)			/* put a byte brightness to stdout */
 COLOR  col;
-FILE  *fp;
 {
 	register int  i;
 	BYTE  vb;
 
 	i = bright(col)*256.;
 	vb = min(i,255);
-	fwrite((char *)&vb, sizeof(BYTE), 1, fp);
+	fwrite((char *)&vb, sizeof(BYTE), 1, stdout);
 
-	return(ferror(fp) ? -1 : 0);
+	return(ferror(stdout) ? -1 : 0);
 }
 
 
+putpascii(col)			/* put an ascii primary to stdout */
+COLOR  col;
+{
+	fprintf(stdout, "%15.3e\n", colval(col,putprim));
+
+	return(ferror(stdout) ? -1 : 0);
+}
+
+
+putpfloat(col)			/* put a float primary to stdout */
+COLOR  col;
+{
+	float  vf;
+
+	vf = colval(col,putprim);
+	fwrite((char *)&vf, sizeof(float), 1, stdout);
+
+	return(ferror(stdout) ? -1 : 0);
+}
+
+
+putpdouble(col)			/* put a double primary to stdout */
+COLOR  col;
+{
+	double	vd;
+
+	vd = colval(col,putprim);
+	fwrite((char *)&vd, sizeof(double), 1, stdout);
+
+	return(ferror(stdout) ? -1 : 0);
+}
+
+
+putpint(col)			/* put an int primary to stdout */
+COLOR  col;
+{
+	fprintf(stdout, "%d\n", (int)(colval(col,putprim)*256.));
+
+	return(ferror(stdout) ? -1 : 0);
+}
+
+
+putpbyte(col)			/* put a byte primary to stdout */
+COLOR  col;
+{
+	register int  i;
+	BYTE  vb;
+
+	i = colval(col,putprim)*256.;
+	vb = min(i,255);
+	fwrite((char *)&vb, sizeof(BYTE), 1, stdout);
+
+	return(ferror(stdout) ? -1 : 0);
+}
+
+
 set_io()			/* set put and get functions */
 {
 	switch (format) {
 	case 'a':					/* ascii */
-		if (brightonly) {
+		if (putprim == BRIGHT) {
 			getval = getbascii;
 			putval = putbascii;
+		} else if (putprim != ALL) {
+			getval = getbascii;
+			putval = putpascii;
 		} else {
 			getval = getcascii;
 			putval = putcascii;
+			if (reverse && !interleave) {
+				fprintf(stderr,
+				"%s: ASCII input files must be interleaved\n",
+						progname);
+				quit(1);
+			}
 		}
 		return;
 	case 'f':					/* binary float */
-		if (brightonly) {
+		if (putprim == BRIGHT) {
 			getval = getbfloat;
 			putval = putbfloat;
+		} else if (putprim != ALL) {
+			getval = getbfloat;
+			putval = putpfloat;
 		} else {
 			getval = getcfloat;
 			putval = putcfloat;
+			if (reverse && !interleave) {
+				if (fin2 == NULL)
+					goto namerr;
+				if (fseek(fin2,
+				(long)sizeof(float)*picres.xr*picres.yr, 1))
+					goto seekerr;
+				if (fseek(fin3,
+				(long)sizeof(float)*2*picres.xr*picres.yr, 1))
+					goto seekerr;
+			}
 		}
 		return;
 	case 'd':					/* binary double */
-		if (brightonly) {
+		if (putprim == BRIGHT) {
 			getval = getbdouble;
 			putval = putbdouble;
+		} else if (putprim != ALL) {
+			getval = getbdouble;
+			putval = putpdouble;
 		} else {
 			getval = getcdouble;
 			putval = putcdouble;
+			if (reverse && !interleave) {
+				if (fin2 == NULL)
+					goto namerr;
+				if (fseek(fin2,
+				(long)sizeof(double)*picres.xr*picres.yr, 1))
+					goto seekerr;
+				if (fseek(fin3,
+				(long)sizeof(double)*2*picres.xr*picres.yr, 1))
+					goto seekerr;
+			}
 		}
 		return;
 	case 'i':					/* integer */
-		if (brightonly) {
+		if (putprim == BRIGHT) {
 			getval = getbint;
 			putval = putbint;
+		} else if (putprim != ALL) {
+			getval = getbint;
+			putval = putpint;
 		} else {
 			getval = getcint;
 			putval = putcint;
+			if (reverse && !interleave) {
+				fprintf(stderr,
+				"%s: integer input files must be interleaved\n",
+						progname);
+				quit(1);
+			}
 		}
 		return;
 	case 'b':					/* byte */
-		if (brightonly) {
+		if (putprim == BRIGHT) {
 			getval = getbbyte;
 			putval = putbbyte;
+		} else if (putprim != ALL) {
+			getval = getbbyte;
+			putval = putpbyte;
 		} else {
 			getval = getcbyte;
 			putval = putcbyte;
+			if (reverse && !interleave) {
+				if (fin2 == NULL)
+					goto namerr;
+				if (fseek(fin2,
+				(long)sizeof(BYTE)*picres.xr*picres.yr, 1))
+					goto seekerr;
+				if (fseek(fin3,
+				(long)sizeof(BYTE)*2*picres.xr*picres.yr, 1))
+					goto seekerr;
+			}
 		}
 		return;
 	}
+badopt:
+	fprintf(stderr, "%s: botched file type\n", progname);
+	quit(1);
+namerr:
+	fprintf(stderr, "%s: non-interleaved file(s) must be named\n",
+			progname);
+	quit(1);
+seekerr:
+	fprintf(stderr, "%s: cannot seek on interleaved input file\n",
+			progname);
+	quit(1);
 }