--- ray/src/px/pvalue.c	1990/01/05 17:52:54	1.3
+++ ray/src/px/pvalue.c	1992/05/08 11:55:42	2.4
@@ -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";
@@ -10,18 +10,19 @@ static char SCCSid[] = "$SunId$ LBL";
  *     4/23/86
  */
 
-#include  <stdio.h>
+#include  "standard.h"
 
 #include  "color.h"
 
+#include  "resolu.h"
+
 #define  min(a,b)		((a)<(b)?(a):(b))
 
-int  xres = 0;			/* resolution of input */
-int  yres = 0;
+RESOLU  picres;			/* resolution of picture */
 
-int  uniq = 0;			/* unique values? */
+int  uniq = 0;			/* print only unique values? */
 
-int  original = 0;		/* original values? */
+int  original = 0;		/* convert back to original values? */
 
 int  dataonly = 0;		/* data only format? */
 
@@ -30,11 +31,21 @@ int  brightonly = 0;		/* only brightness values? */
 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? */
 
-double  exposure = 1.0;
+int  resolution = 1;		/* put/get resolution string? */
 
+int  wrongformat = 0;		/* wrong input format? */
+
+double  gamcor = 1.0;		/* gamma correction */
+
+int  ord[3] = {RED, GRN, BLU};	/* RGB ordering */
+int  rord[4];			/* reverse ordering */
+
+COLOR  exposure = WHTCOLOR;
+
 char  *progname;
 
 FILE  *fin;
@@ -46,52 +57,88 @@ main(argc, argv)
 int  argc;
 char  **argv;
 {
-	extern double  atof();
 	extern int  checkhead();
 	int  i;
 
 	progname = argv[0];
 
 	for (i = 1; i < argc; i++)
-		if (argv[i][0] == '-')
+		if (argv[i][0] == '-' || argv[i][0] == '+')
 			switch (argv[i][1]) {
-			case 'h':		/* no header */
-				header = 0;
+			case 'h':		/* header */
+				header = argv[i][0] == '+';
 				break;
+			case 'H':		/* resolution string */
+				resolution = argv[i][0] == '+';
+				break;
 			case 'u':		/* unique values */
-				uniq = 1;
+				uniq = argv[i][0] == '-';
 				break;
 			case 'o':		/* original values */
-				original = 1;
+				original = argv[i][0] == '-';
 				break;
+			case 'g':		/* gamma correction */
+				gamcor = atof(argv[++i]);
+				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 = 1;
+				reverse = argv[i][0] == '-';
 				break;
 			case 'b':		/* brightness values */
-				brightonly = 1;
+				brightonly = argv[i][0] == '-';
 				break;
 			case 'd':		/* data only (no indices) */
-				dataonly = 1;
+				dataonly = argv[i][0] == '-';
 				switch (argv[i][2]) {
 				case '\0':
 				case 'a':		/* ascii */
 					format = 'a';
+					fmtid = "ascii";
 					break;
 				case 'i':		/* integer */
+					format = 'i';
+					fmtid = "ascii";
+					break;
 				case 'b':		/* byte */
+					dataonly = 1;
+					format = 'b';
+					fmtid = "byte";
+					break;
 				case 'f':		/* float */
+					dataonly = 1;
+					format = 'f';
+					fmtid = "float";
+					break;
 				case 'd':		/* double */
-					format = argv[i][2];
+					dataonly = 1;
+					format = 'd';
+					fmtid = "double";
 					break;
 				default:
 					goto unkopt;
 				}
 				break;
 			case 'x':		/* x resolution */
-				xres = atoi(argv[++i]);
+				resolution = 0;
+				if (argv[i][0] == '-')
+					picres.or |= XDECR;
+				picres.xr = atoi(argv[++i]);
 				break;
 			case 'y':		/* y resolution */
-				yres = atoi(argv[++i]);
+				resolution = 0;
+				if (argv[i][0] == '-')
+					picres.or |= YDECR;
+				if (picres.xr == 0)
+					picres.or |= YMAJOR;
+				picres.yr = atoi(argv[++i]);
 				break;
 			default:
 unkopt:
@@ -102,7 +149,17 @@ unkopt:
 			}
 		else
 			break;
-			
+					/* recognize special formats */
+	if (dataonly && format == 'b')
+		if (brightonly)
+			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) {
@@ -119,33 +176,42 @@ unkopt:
 	set_io();
 
 	if (reverse) {
-		if (header)			/* get header */
-			copyheader(fin, stdout);
-						/* add to header */
-		printargs(i, argv, stdout);
-		printf("\n");
-		if (yres <= 0 || xres <= 0) {
-			fprintf(stderr, "%s: missing x and y resolution\n",
-					progname);
+					/* get header */
+		if (header && checkheader(fin, fmtid, stdout) < 0) {
+			fprintf(stderr, "%s: wrong input format\n", progname);
 			quit(1);
 		}
-		fputresolu(YMAJOR|YDECR, xres, yres, stdout);
+					/* 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);	/* always put resolution */
 		valtopix();
 	} else {
 						/* get header */
-		getheader(fin, checkhead);
-
-		if (xres <= 0 || yres <= 0)		/* get picture size */
-			if (fgetresolu(&xres, &yres, fin) != (YMAJOR|YDECR)) {
-				fprintf(stderr,
-				"%s: missing x and y resolution\n",
-						progname);
-				quit(1);
-			}
+		getheader(fin, checkhead, NULL);
+		if (wrongformat) {
+			fprintf(stderr, "%s: input not a Radiance picture\n",
+					progname);
+			quit(1);
+		}
+		if (!fgetsresolu(&picres, fin)) {
+			fprintf(stderr, "%s: missing resolution\n", progname);
+			quit(1);
+		}
 		if (header) {
 			printargs(i, argv, stdout);
-			printf("\n");
+			fputformat(fmtid, stdout);
+			putchar('\n');
 		}
+		if (resolution)			/* put resolution */
+			fputsresolu(&picres, stdout);
 		pixtoval();
 	}
 
@@ -156,43 +222,70 @@ unkopt:
 checkhead(line)				/* deal with line from header */
 char  *line;
 {
-	if (header)
+	char	fmt[32];
+	double	d;
+	COLOR	ctmp;
+
+	if (isformat(line)) {
+		formatval(fmt, line);
+		wrongformat = strcmp(fmt, COLRFMT);
+	} else if (original && isexpos(line)) {
+		d = 1.0/exposval(line);
+		scalecolor(exposure, d);
+	} else if (original && iscolcor(line)) {
+		colcorval(ctmp, line);
+		setcolor(exposure, colval(exposure,RED)/colval(ctmp,RED),
+				colval(exposure,GRN)/colval(ctmp,GRN),
+				colval(exposure,BLU)/colval(ctmp,BLU));
+	} else if (header)
 		fputs(line, stdout);
-	if (isexpos(line))
-		exposure *= exposval(line);
 }
 
 
 pixtoval()				/* convert picture to values */
 {
-	COLOR  *scanln;
+	register COLOR  *scanln;
+	int  dogamma;
 	COLOR  lastc;
+	FLOAT  hv[2];
 	int  y;
 	register int  x;
 
-	scanln = (COLOR *)malloc(xres*sizeof(COLOR));
+	scanln = (COLOR *)malloc(scanlen(&picres)*sizeof(COLOR));
 	if (scanln == NULL) {
 		fprintf(stderr, "%s: out of memory\n", progname);
 		quit(1);
 	}
+	dogamma = gamcor < .95 || gamcor > 1.05;
 	setcolor(lastc, 0.0, 0.0, 0.0);
-	for (y = yres-1; y >= 0; y--) {
-		if (freadscan(scanln, xres, fin) < 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 < xres; x++) {
+		for (x = 0; x < scanlen(&picres); x++) {
 			if (uniq)
-				if (	scanln[x][RED] == lastc[RED] &&
-					scanln[x][GRN] == lastc[GRN] &&
-					scanln[x][BLU] == lastc[BLU]	)
+				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 (original)
-				scalecolor(scanln[x], 1.0/exposure);
-			if (!dataonly)
-				printf("%7d %7d ", x, y);
+				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);
 				quit(1);
@@ -205,26 +298,32 @@ pixtoval()				/* convert picture to values */
 
 valtopix()			/* convert values to a pixel file */
 {
-	COLOR  *scanln;
+	int  dogamma;
+	register COLOR  *scanln;
 	int  y;
 	register int  x;
 
-	scanln = (COLOR *)malloc(xres*sizeof(COLOR));
+	scanln = (COLOR *)malloc(scanlen(&picres)*sizeof(COLOR));
 	if (scanln == NULL) {
 		fprintf(stderr, "%s: out of memory\n", progname);
 		quit(1);
 	}
-	for (y = yres-1; y >= 0; y--) {
-		for (x = 0; x < xres; x++) {
+	dogamma = gamcor < .95 || gamcor > 1.05;
+	for (y = 0; y < numscans(&picres); y++) {
+		for (x = 0; x < scanlen(&picres); x++) {
 			if (!dataonly)
 				fscanf(fin, "%*d %*d");
 			if ((*getval)(scanln[x], fin) < 0) {
 				fprintf(stderr, "%s: read error\n", progname);
 				quit(1);
 			}
+			if (dogamma)
+				setcolor(scanln[x],
+					pow(colval(scanln[x],RED), gamcor),
+					pow(colval(scanln[x],GRN), gamcor),
+					pow(colval(scanln[x],BLU), gamcor));
 		}
-		if (fwritescan(scanln, xres, stdout) < 0
-				|| fflush(stdout) < 0) {
+		if (fwritescan(scanln, scanlen(&picres), stdout) < 0) {
 			fprintf(stderr, "%s: write error\n", progname);
 			quit(1);
 		}
@@ -248,7 +347,7 @@ FILE  *fp;
 
 	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);
 }
 
@@ -259,9 +358,9 @@ FILE  *fp;
 {
 	double  vd[3];
 
-	if (fread(vd, sizeof(double), 3, fp) != 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);
 }
 
@@ -272,9 +371,9 @@ FILE  *fp;
 {
 	float  vf[3];
 
-	if (fread(vf, sizeof(float), 3, fp) != 3)
+	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);
 }
 
@@ -287,7 +386,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);
 }
 
@@ -298,9 +398,10 @@ FILE  *fp;
 {
 	BYTE  vb[3];
 
-	if (fread(vb, sizeof(BYTE), 3, fp) != 3)
+	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);
 }
 
@@ -324,7 +425,7 @@ FILE  *fp;
 {
 	double  vd;
 
-	if (fread(&vd, sizeof(double), 1, fp) != 1)
+	if (fread((char *)&vd, sizeof(double), 1, fp) != 1)
 		return(-1);
 	setcolor(col, vd, vd, vd);
 	return(0);
@@ -337,7 +438,7 @@ FILE  *fp;
 {
 	float  vf;
 
-	if (fread(&vf, sizeof(float), 1, fp) != 1)
+	if (fread((char *)&vf, sizeof(float), 1, fp) != 1)
 		return(-1);
 	setcolor(col, vf, vf, vf);
 	return(0);
@@ -366,7 +467,7 @@ FILE  *fp;
 	BYTE  vb;
 	double  d;
 
-	if (fread(&vb, sizeof(BYTE), 1, fp) != 1)
+	if (fread((char *)&vb, sizeof(BYTE), 1, fp) != 1)
 		return(-1);
 	d = (vb+.5)/256.;
 	setcolor(col, d, d, d);
@@ -379,9 +480,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);
 }
@@ -393,10 +494,10 @@ FILE  *fp;
 {
 	float  vf[3];
 
-	vf[0] = colval(col,RED);
-	vf[1] = colval(col,GRN);
-	vf[2] = colval(col,BLU);
-	fwrite(vf, sizeof(float), 3, fp);
+	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);
 }
@@ -408,10 +509,10 @@ FILE  *fp;
 {
 	double  vd[3];
 
-	vd[0] = colval(col,RED);
-	vd[1] = colval(col,GRN);
-	vd[2] = colval(col,BLU);
-	fwrite(vd, sizeof(double), 3, fp);
+	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);
 }
@@ -422,9 +523,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);
 }
@@ -437,13 +538,13 @@ 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(vb, sizeof(BYTE), 3, fp);
+	fwrite((char *)vb, sizeof(BYTE), 3, fp);
 
 	return(ferror(fp) ? -1 : 0);
 }
@@ -466,7 +567,7 @@ FILE  *fp;
 	float  vf;
 
 	vf = bright(col);
-	fwrite(&vf, sizeof(float), 1, fp);
+	fwrite((char *)&vf, sizeof(float), 1, fp);
 
 	return(ferror(fp) ? -1 : 0);
 }
@@ -479,7 +580,7 @@ FILE  *fp;
 	double  vd;
 
 	vd = bright(col);
-	fwrite(&vd, sizeof(double), 1, fp);
+	fwrite((char *)&vd, sizeof(double), 1, fp);
 
 	return(ferror(fp) ? -1 : 0);
 }
@@ -504,7 +605,7 @@ FILE  *fp;
 
 	i = bright(col)*256.;
 	vb = min(i,255);
-	fwrite(&vb, sizeof(BYTE), 1, fp);
+	fwrite((char *)&vb, sizeof(BYTE), 1, fp);
 
 	return(ferror(fp) ? -1 : 0);
 }