--- ray/src/px/pvalue.c	2003/02/25 16:47:23	2.16
+++ ray/src/px/pvalue.c	2003/06/20 00:25:50	2.20
@@ -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.20 2003/06/20 00:25:50 greg Exp $";
 #endif
 /*
  *  pvalue.c - program to print pixel values.
@@ -7,24 +7,19 @@ static const char RCSid[] = "$Id: pvalue.c,v 2.16 2003
  *     4/23/86
  */
 
-#include  "standard.h"
-
-#include  "color.h"
-
 #include  <time.h>
 
+#include  "standard.h"
+#include  "platform.h"
+#include  "color.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? */
@@ -219,15 +214,15 @@ unkopt:
 			break;
 					/* recognize special formats */
 	if (dataonly && format == 'b')
-		if (brightonly)
-			fmtid = "8-bit_grey";
-		else
+		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 +236,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 +250,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 +268,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 +316,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);