--- ray/src/px/pvalue.c	1991/12/19 14:52:04	2.2
+++ ray/src/px/pvalue.c	1992/09/21 12:14:37	2.5
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -16,9 +16,9 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "resolu.h"
 
-#define  min(a,b)		((a)<(b)?(a):(b))
+#define	 min(a,b)		((a)<(b)?(a):(b))
 
-RESOLU  picres;			/* resolution of picture */
+RESOLU	picres;			/* resolution of picture */
 
 int  uniq = 0;			/* print only unique values? */
 
@@ -33,12 +33,17 @@ int  reverse = 0;		/* reverse conversion? */
 int  format = 'a';		/* input/output format */
 char  *fmtid = "ascii";		/* format identifier for header */
 
-int  header = 1;		/* do header */
+int  header = 1;		/* do header? */
 
+int  resolution = 1;		/* put/get resolution string? */
+
 int  wrongformat = 0;		/* wrong input format? */
 
-double  gamcor = 1.0;		/* gamma correction */
+double	gamcor = 1.0;		/* gamma correction */
 
+int  ord[3] = {RED, GRN, BLU};	/* RGB ordering */
+int  rord[4];			/* reverse ordering */
+
 COLOR  exposure = WHTCOLOR;
 
 char  *progname;
@@ -63,6 +68,9 @@ char  **argv;
 			case 'h':		/* header */
 				header = argv[i][0] == '+';
 				break;
+			case 'H':		/* resolution string */
+				resolution = argv[i][0] == '+';
+				break;
 			case 'u':		/* unique values */
 				uniq = argv[i][0] == '-';
 				break;
@@ -74,6 +82,13 @@ char  **argv;
 				if (argv[i][0] == '+')
 					gamcor = 1.0/gamcor;
 				break;
+			case 'R':		/* reverse byte sequence */
+				if (argv[i][0] == '-') {
+					ord[0]=BLU; ord[1]=GRN; ord[2]=RED;
+				} else {
+					ord[0]=RED; ord[1]=GRN; ord[2]=BLU;
+				}
+				break;
 			case 'r':		/* reverse conversion */
 				reverse = argv[i][0] == '-';
 				break;
@@ -112,11 +127,13 @@ char  **argv;
 				}
 				break;
 			case 'x':		/* x resolution */
+				resolution = 0;
 				if (argv[i][0] == '-')
 					picres.or |= XDECR;
 				picres.xr = atoi(argv[++i]);
 				break;
 			case 'y':		/* y resolution */
+				resolution = 0;
 				if (argv[i][0] == '-')
 					picres.or |= YDECR;
 				if (picres.xr == 0)
@@ -138,7 +155,11 @@ unkopt:
 			fmtid = "8-bit_grey";
 		else
 			fmtid = "24-bit_rgb";
-
+					/* assign reverse ordering */
+	rord[ord[0]] = 0;
+	rord[ord[1]] = 1;
+	rord[ord[2]] = 2;
+					/* get input */
 	if (i == argc) {
 		fin = stdin;
 	} else if (i == argc-1) {
@@ -155,24 +176,34 @@ unkopt:
 	set_io();
 
 	if (reverse) {
+#ifdef MSDOS
+		setmode(fileno(stdout), O_BINARY);
+		if (format != 'a' && format != 'i')
+			setmode(fileno(fin), O_BINARY);
+#endif
 					/* get header */
 		if (header && checkheader(fin, fmtid, stdout) < 0) {
 			fprintf(stderr, "%s: wrong input format\n", progname);
 			quit(1);
 		}
-		if (picres.xr <= 0 || picres.yr <= 0)	/* get resolution */
-			if (!fgetsresolu(&picres, fin)) {
-				fprintf(stderr, "%s: missing resolution\n",
-						progname);
-				quit(1);
-			}
+					/* get resolution */
+		if ((resolution && !fgetsresolu(&picres, fin)) ||
+				picres.xr <= 0 || picres.yr <= 0) {
+			fprintf(stderr, "%s: missing resolution\n", progname);
+			quit(1);
+		}
 						/* add to header */
 		printargs(i, argv, stdout);
 		fputformat(COLRFMT, stdout);
 		putchar('\n');
-		fputsresolu(&picres, stdout);
+		fputsresolu(&picres, stdout);	/* always put resolution */
 		valtopix();
 	} else {
+#ifdef MSDOS
+		setmode(fileno(fin), O_BINARY);
+		if (format != 'a' && format != 'i')
+			setmode(fileno(stdout), O_BINARY);
+#endif
 						/* get header */
 		getheader(fin, checkhead, NULL);
 		if (wrongformat) {
@@ -180,18 +211,17 @@ unkopt:
 					progname);
 			quit(1);
 		}
-
-		if (picres.xr <= 0 || picres.yr <= 0)	/* get picture size */
-			if (!fgetsresolu(&picres, fin)) {
-				fprintf(stderr, "%s: missing resolution\n",
-						progname);
-				quit(1);
-			}
+		if (!fgetsresolu(&picres, fin)) {
+			fprintf(stderr, "%s: missing resolution\n", progname);
+			quit(1);
+		}
 		if (header) {
 			printargs(i, argv, stdout);
 			fputformat(fmtid, stdout);
 			putchar('\n');
 		}
+		if (resolution)			/* put resolution */
+			fputsresolu(&picres, stdout);
 		pixtoval();
 	}
 
@@ -224,7 +254,7 @@ char  *line;
 
 pixtoval()				/* convert picture to values */
 {
-	register COLOR  *scanln;
+	register COLOR	*scanln;
 	int  dogamma;
 	COLOR  lastc;
 	FLOAT  hv[2];
@@ -279,7 +309,7 @@ pixtoval()				/* convert picture to values */
 valtopix()			/* convert values to a pixel file */
 {
 	int  dogamma;
-	register COLOR  *scanln;
+	register COLOR	*scanln;
 	int  y;
 	register int  x;
 
@@ -323,11 +353,11 @@ getcascii(col, fp)		/* get an ascii color value from f
 COLOR  col;
 FILE  *fp;
 {
-	double  vd[3];
+	double	vd[3];
 
 	if (fscanf(fp, "%lf %lf %lf", &vd[0], &vd[1], &vd[2]) != 3)
 		return(-1);
-	setcolor(col, vd[0], vd[1], vd[2]);
+	setcolor(col, vd[rord[RED]], vd[rord[GRN]], vd[rord[BLU]]);
 	return(0);
 }
 
@@ -336,11 +366,11 @@ getcdouble(col, fp)		/* get a double color value from 
 COLOR  col;
 FILE  *fp;
 {
-	double  vd[3];
+	double	vd[3];
 
 	if (fread((char *)vd, sizeof(double), 3, fp) != 3)
 		return(-1);
-	setcolor(col, vd[0], vd[1], vd[2]);
+	setcolor(col, vd[rord[RED]], vd[rord[GRN]], vd[rord[BLU]]);
 	return(0);
 }
 
@@ -353,7 +383,7 @@ FILE  *fp;
 
 	if (fread((char *)vf, sizeof(float), 3, fp) != 3)
 		return(-1);
-	setcolor(col, vf[0], vf[1], vf[2]);
+	setcolor(col, vf[rord[RED]], vf[rord[GRN]], vf[rord[BLU]]);
 	return(0);
 }
 
@@ -366,7 +396,8 @@ FILE  *fp;
 
 	if (fscanf(fp, "%d %d %d", &vi[0], &vi[1], &vi[2]) != 3)
 		return(-1);
-	setcolor(col,(vi[0]+.5)/256.,(vi[1]+.5)/256.,(vi[2]+.5)/256.);
+	setcolor(col, (vi[rord[RED]]+.5)/256.,
+			(vi[rord[GRN]]+.5)/256., (vi[rord[BLU]]+.5)/256.);
 	return(0);
 }
 
@@ -379,7 +410,8 @@ FILE  *fp;
 
 	if (fread((char *)vb, sizeof(BYTE), 3, fp) != 3)
 		return(-1);
-	setcolor(col,(vb[0]+.5)/256.,(vb[1]+.5)/256.,(vb[2]+.5)/256.);
+	setcolor(col, (vb[rord[RED]]+.5)/256.,
+			(vb[rord[GRN]]+.5)/256., (vb[rord[BLU]]+.5)/256.);
 	return(0);
 }
 
@@ -388,7 +420,7 @@ getbascii(col, fp)		/* get an ascii brightness value f
 COLOR  col;
 FILE  *fp;
 {
-	double  vd;
+	double	vd;
 
 	if (fscanf(fp, "%lf", &vd) != 1)
 		return(-1);
@@ -401,7 +433,7 @@ getbdouble(col, fp)		/* get a double brightness value 
 COLOR  col;
 FILE  *fp;
 {
-	double  vd;
+	double	vd;
 
 	if (fread((char *)&vd, sizeof(double), 1, fp) != 1)
 		return(-1);
@@ -428,7 +460,7 @@ COLOR  col;
 FILE  *fp;
 {
 	int  vi;
-	double  d;
+	double	d;
 
 	if (fscanf(fp, "%d", &vi) != 1)
 		return(-1);
@@ -443,7 +475,7 @@ COLOR  col;
 FILE  *fp;
 {
 	BYTE  vb;
-	double  d;
+	double	d;
 
 	if (fread((char *)&vb, sizeof(BYTE), 1, fp) != 1)
 		return(-1);
@@ -458,9 +490,9 @@ COLOR  col;
 FILE  *fp;
 {
 	fprintf(fp, "%15.3e %15.3e %15.3e\n",
-			colval(col,RED),
-			colval(col,GRN),
-			colval(col,BLU));
+			colval(col,ord[0]),
+			colval(col,ord[1]),
+			colval(col,ord[2]));
 
 	return(ferror(fp) ? -1 : 0);
 }
@@ -472,9 +504,9 @@ FILE  *fp;
 {
 	float  vf[3];
 
-	vf[0] = colval(col,RED);
-	vf[1] = colval(col,GRN);
-	vf[2] = colval(col,BLU);
+	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);
 
 	return(ferror(fp) ? -1 : 0);
@@ -485,11 +517,11 @@ putcdouble(col, fp)			/* put a double color to fp */
 COLOR  col;
 FILE  *fp;
 {
-	double  vd[3];
+	double	vd[3];
 
-	vd[0] = colval(col,RED);
-	vd[1] = colval(col,GRN);
-	vd[2] = colval(col,BLU);
+	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);
 
 	return(ferror(fp) ? -1 : 0);
@@ -501,9 +533,9 @@ COLOR  col;
 FILE  *fp;
 {
 	fprintf(fp, "%d %d %d\n",
-			(int)(colval(col,RED)*256.),
-			(int)(colval(col,GRN)*256.),
-			(int)(colval(col,BLU)*256.));
+			(int)(colval(col,ord[0])*256.),
+			(int)(colval(col,ord[1])*256.),
+			(int)(colval(col,ord[2])*256.));
 
 	return(ferror(fp) ? -1 : 0);
 }
@@ -516,11 +548,11 @@ FILE  *fp;
 	register int  i;
 	BYTE  vb[3];
 
-	i = colval(col,RED)*256.;
+	i = colval(col,ord[0])*256.;
 	vb[0] = min(i,255);
-	i = colval(col,GRN)*256.;
+	i = colval(col,ord[1])*256.;
 	vb[1] = min(i,255);
-	i = colval(col,BLU)*256.;
+	i = colval(col,ord[2])*256.;
 	vb[2] = min(i,255);
 	fwrite((char *)vb, sizeof(BYTE), 3, fp);
 
@@ -555,7 +587,7 @@ putbdouble(col, fp)			/* put a double brightness to fp
 COLOR  col;
 FILE  *fp;
 {
-	double  vd;
+	double	vd;
 
 	vd = bright(col);
 	fwrite((char *)&vd, sizeof(double), 1, fp);