--- ray/src/px/pvalue.c	2003/02/25 16:47:23	2.16
+++ ray/src/px/pvalue.c	2004/01/02 12:47:01	2.25
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: pvalue.c,v 2.16 2003/02/25 16:47:23 greg Exp $";
+static const char RCSid[] = "$Id: pvalue.c,v 2.25 2004/01/02 12:47:01 schorsch Exp $";
 #endif
 /*
  *  pvalue.c - program to print pixel values.
@@ -7,24 +7,17 @@ static const char RCSid[] = "$Id: pvalue.c,v 2.16 2003
  *     4/23/86
  */
 
+#include  "platform.h"
 #include  "standard.h"
-
 #include  "color.h"
-
-#include  <time.h>
-
 #include  "resolu.h"
 
-typedef	unsigned short uint16;	/* sizeof (uint16) must == 2 */
-
 #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? */
@@ -44,7 +37,7 @@ int  header = 1;		/* do header? */
 
 long  skipbytes = 0;		/* skip bytes in input? */
 
-int  swapbytes = 0;		/* swap bytes in 16-bit words? */
+int  swapbytes = 0;		/* swap bytes? */
 
 int  interleave = 1;		/* file is interleaved? */
 
@@ -68,6 +61,9 @@ FILE  *fin2 = NULL, *fin3 = NULL;	/* for other color c
 
 int  (*getval)(), (*putval)();
 
+static gethfunc checkhead;
+
+
 double
 rgb_bright(clr)
 COLOR  clr;
@@ -89,7 +85,6 @@ main(argc, argv)
 int  argc;
 char  **argv;
 {
-	extern int  checkhead();
 	extern long  atol();
 	double  d, expval = 1.0;
 	int  i;
@@ -178,11 +173,15 @@ char  **argv;
 					format = 'w';
 					fmtid = "16-bit";
 					break;
+				case 'F':		/* swapped floats */
+					swapbytes = 1;
 				case 'f':		/* float */
 					dataonly = 1;
 					format = 'f';
 					fmtid = "float";
 					break;
+				case 'D':		/* swapped doubles */
+					swapbytes = 1;
 				case 'd':		/* double */
 					dataonly = 1;
 					format = 'd';
@@ -218,16 +217,18 @@ unkopt:
 		else
 			break;
 					/* recognize special formats */
-	if (dataonly && format == 'b')
-		if (brightonly)
-			fmtid = "8-bit_grey";
-		else
+	if (dataonly && format == 'b') {
+		if (putprim == ALL)
 			fmtid = "24-bit_rgb";
-	if (dataonly && format == 'w')
-		if (brightonly)
-			fmtid = "16-bit_grey";
 		else
+			fmtid = "8-bit_grey";
+	}
+	if (dataonly && format == 'w') {
+		if (putprim == ALL)
 			fmtid = "48-bit_rgb";
+		else
+			fmtid = "16-bit_grey";
+	}
 					/* assign reverse ordering */
 	rord[ord[0]] = 0;
 	rord[ord[1]] = 1;
@@ -241,7 +242,7 @@ unkopt:
 						progname, argv[i]);
 			quit(1);
 		}
-		if (reverse && !brightonly && i == argc-3) {
+		if (reverse && putprim != BRIGHT && i == argc-3) {
 			if ((fin2 = fopen(argv[i+1], "r")) == NULL) {
 				fprintf(stderr, "%s: can't open file \"%s\"\n",
 						progname, argv[i+1]);
@@ -255,7 +256,7 @@ unkopt:
 			interleave = -1;
 		} else if (i != argc-1)
 			fin = NULL;
-		if (reverse && !brightonly && !interleave) {
+		if (reverse && putprim != BRIGHT && !interleave) {
 			fin2 = fopen(argv[i], "r");
 			fin3 = fopen(argv[i], "r");
 		}
@@ -273,10 +274,10 @@ unkopt:
 	}
 
 	if (reverse) {
-#ifdef MSDOS
-		setmode(fileno(stdout), O_BINARY);
+#ifdef _WIN32
+		SET_FILE_BINARY(stdout);
 		if (format != 'a' && format != 'i')
-			setmode(fileno(fin), O_BINARY);
+			SET_FILE_BINARY(fin);
 #endif
 					/* get header */
 		if (header) {
@@ -321,10 +322,10 @@ unkopt:
 		fputsresolu(&picres, stdout);	/* always put resolution */
 		valtopix();
 	} else {
-#ifdef MSDOS
-		setmode(fileno(fin), O_BINARY);
+#ifdef _WIN32
+		SET_FILE_BINARY(fin);
 		if (format != 'a' && format != 'i')
-			setmode(fileno(stdout), O_BINARY);
+			SET_FILE_BINARY(stdout);
 #endif
 						/* get header */
 		getheader(fin, checkhead, NULL);
@@ -354,9 +355,11 @@ unkopt:
 }
 
 
-int
-checkhead(line)				/* deal with line from header */
-char  *line;
+static int
+checkhead(				/* deal with line from header */
+	char	*line,
+	void	*p
+)
 {
 	char	fmt[32];
 	double	d;
@@ -394,7 +397,7 @@ pixtoval()				/* convert picture to values */
 	register COLOR	*scanln;
 	int  dogamma;
 	COLOR  lastc;
-	FLOAT  hv[2];
+	RREAL  hv[2];
 	int  startprim, endprim;
 	long  startpos;
 	int  y;
@@ -426,7 +429,7 @@ pixtoval()				/* convert picture to values */
 				quit(1);
 			}
 			for (x = 0; x < scanlen(&picres); x++) {
-				if (uniq)
+				if (uniq) {
 					if (	colval(scanln[x],RED) ==
 							colval(lastc,RED) &&
 						colval(scanln[x],GRN) ==
@@ -436,6 +439,7 @@ pixtoval()				/* convert picture to values */
 						continue;
 					else
 						copycolor(lastc, scanln[x]);
+				}
 				if (doexposure)
 					multcolor(scanln[x], exposure);
 				if (dogamma)
@@ -523,6 +527,35 @@ int  n;
 	}
 }
 
+
+swap32(wp, n)		/* swap n 32-bit words */
+register uint32  *wp;
+int  n;
+{
+	while (n-- > 0) {
+		*wp = *wp << 24 | ((*wp >> 24) & 0xff) |
+			(*wp & 0xff00) << 8 | (*wp & 0xff0000) >> 8;
+		wp++;
+	}
+}
+
+
+swap64(wp, n)		/* swap n 64-bit words */
+register char  *wp;
+int  n;
+{
+	register int	t;
+
+	while (n-- > 0) {
+		t = wp[0]; wp[0] = wp[7]; wp[7] = t;
+		t = wp[1]; wp[1] = wp[6]; wp[6] = t;
+		t = wp[2]; wp[2] = wp[5]; wp[5] = t;
+		t = wp[3]; wp[3] = wp[4]; wp[4] = t;
+		wp += 8;
+	}
+}
+
+
 getcascii(col)		/* get an ascii color value from stream(s) */
 COLOR  col;
 {
@@ -556,6 +589,8 @@ COLOR  col;
 			fread((char *)(vd+2), sizeof(double), 1, fin3) != 1)
 			return(-1);
 	}
+	if (swapbytes)
+		swap64((char *)vd, 3);
 	setcolor(col, vd[rord[RED]], vd[rord[GRN]], vd[rord[BLU]]);
 	return(0);
 }
@@ -575,6 +610,8 @@ COLOR  col;
 			fread((char *)(vf+2), sizeof(float), 1, fin3) != 1)
 			return(-1);
 	}
+	if (swapbytes)
+		swap32((uint32 *)vf, 3);
 	setcolor(col, vf[rord[RED]], vf[rord[GRN]], vf[rord[BLU]]);
 	return(0);
 }
@@ -661,6 +698,8 @@ COLOR  col;
 
 	if (fread((char *)&vd, sizeof(double), 1, fin) != 1)
 		return(-1);
+	if (swapbytes)
+		swap64((char *)&vd, 1);
 	setcolor(col, vd, vd, vd);
 	return(0);
 }
@@ -673,6 +712,8 @@ COLOR  col;
 
 	if (fread((char *)&vf, sizeof(float), 1, fin) != 1)
 		return(-1);
+	if (swapbytes)
+		swap32((uint32 *)&vf, 1);
 	setcolor(col, vf, vf, vf);
 	return(0);
 }
@@ -742,6 +783,8 @@ COLOR  col;
 	vf[0] = colval(col,ord[0]);
 	vf[1] = colval(col,ord[1]);
 	vf[2] = colval(col,ord[2]);
+	if (swapbytes)
+		swap32((uint32 *)vf, 3);
 	fwrite((char *)vf, sizeof(float), 3, stdout);
 
 	return(ferror(stdout) ? -1 : 0);
@@ -756,6 +799,8 @@ COLOR  col;
 	vd[0] = colval(col,ord[0]);
 	vd[1] = colval(col,ord[1]);
 	vd[2] = colval(col,ord[2]);
+	if (swapbytes)
+		swap64((char *)vd, 3);
 	fwrite((char *)vd, sizeof(double), 3, stdout);
 
 	return(ferror(stdout) ? -1 : 0);
@@ -827,6 +872,8 @@ COLOR  col;
 	float  vf;
 
 	vf = (*mybright)(col);
+	if (swapbytes)
+		swap32((uint32 *)&vf, 1);
 	fwrite((char *)&vf, sizeof(float), 1, stdout);
 
 	return(ferror(stdout) ? -1 : 0);
@@ -839,6 +886,8 @@ COLOR  col;
 	double	vd;
 
 	vd = (*mybright)(col);
+	if (swapbytes)
+		swap64((char *)&vd, 1);
 	fwrite((char *)&vd, sizeof(double), 1, stdout);
 
 	return(ferror(stdout) ? -1 : 0);
@@ -899,6 +948,8 @@ COLOR  col;
 	float  vf;
 
 	vf = colval(col,putprim);
+	if (swapbytes)
+		swap32((uint32 *)&vf, 1);
 	fwrite((char *)&vf, sizeof(float), 1, stdout);
 
 	return(ferror(stdout) ? -1 : 0);
@@ -911,6 +962,8 @@ COLOR  col;
 	double	vd;
 
 	vd = colval(col,putprim);
+	if (swapbytes)
+		swap64((char *)&vd, 1);
 	fwrite((char *)&vd, sizeof(double), 1, stdout);
 
 	return(ferror(stdout) ? -1 : 0);