--- ray/src/px/ra_t16.c	1991/04/18 14:35:42	1.11
+++ ray/src/px/ra_t16.c	1992/10/30 09:11:36	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";
@@ -13,8 +13,16 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <stdio.h>
 
+#ifdef MSDOS
+#include  <fcntl.h>
+#endif
+
+#include  <math.h>
+
 #include  "color.h"
 
+#include  "resolu.h"
+
 #include  "random.h"
 
 #include  "targa.h"
@@ -32,9 +40,9 @@ static char SCCSid[] = "$SunId$ LBL";
 
 extern char	*ecalloc(), *emalloc();
 
-extern double  atof(), pow();
+double	gamcor = 2.2;			/* gamma correction */
 
-double	gamma = 2.0;			/* gamma correction */
+int  bradj = 0;				/* brightness adjustment */
 
 char  *progname;
 
@@ -48,7 +56,12 @@ char  *argv[];
 	struct hdStruct  head;
 	int  reverse = 0;
 	int  i;
-	
+#ifdef MSDOS
+	extern int  _fmode;
+	_fmode = O_BINARY;
+	setmode(fileno(stdin), O_BINARY);
+	setmode(fileno(stdout), O_BINARY);
+#endif
 	progname = argv[0];
 
 	head.dataBits = 16;
@@ -56,7 +69,7 @@ char  *argv[];
 		if (argv[i][0] == '-')
 			switch (argv[i][1]) {
 			case 'g':
-				gamma = atof(argv[++i]);
+				gamcor = atof(argv[++i]);
 				break;
 			case 'r':
 				reverse = !reverse;
@@ -67,6 +80,11 @@ char  *argv[];
 			case '3':
 				head.dataBits = 24;
 				break;
+			case 'e':
+				if (argv[i+1][0] != '+' && argv[i+1][0] != '-')
+					goto userr;
+				bradj = atoi(argv[++i]);
+				break;
 			default:
 				goto userr;
 			}
@@ -86,7 +104,7 @@ char  *argv[];
 		quiterr(msg);
 	}
 					/* set gamma */
-	setcolrgam(gamma);
+	setcolrgam(gamcor);
 					/* convert */
 	if (reverse) {
 					/* get header */
@@ -98,12 +116,12 @@ char  *argv[];
 		printargs(i, argv, stdout);
 		fputformat(COLRFMT, stdout);
 		putchar('\n');
-		fputresolu(YMAJOR|YDECR, head.x, head.y, stdout);
+		fprtresolu(head.x, head.y, stdout);
 					/* convert file */
 		tg2ra(&head);
 	} else {
 		if (checkheader(stdin, COLRFMT, NULL) < 0 ||
-			fgetresolu(&head.x, &head.y, stdin) != (YMAJOR|YDECR))
+				fgetresolu(&head.x, &head.y, stdin) < 0)
 			quiterr("bad picture file");
 					/* assign header */
 		head.textSize = 0;
@@ -119,7 +137,7 @@ char  *argv[];
 	}
 	exit(0);
 userr:
-	fprintf(stderr, "Usage: %s [-2|-3|-r][-g gamma] [input [output]]\n",
+	fprintf(stderr, "Usage: %s [-2|-3|-r][-g gamma][-e +/-stops] [input [output]]\n",
 			progname);
 	exit(1);
 }
@@ -267,6 +285,8 @@ struct hdStruct  *hp;
 			}
 		}
 		gambs_colrs(scanline, hp->x);
+		if (bradj)
+			shiftcolrs(scanline, hp->x, bradj);
 		if (fwritecolrs(scanline, hp->x, stdout) < 0)
 			quiterr("error writing RADIANCE file");
 	}
@@ -288,14 +308,23 @@ struct hdStruct  *hp;
 	for (j = hp->y-1; j >= 0; j--) {
 		if (freadcolrs(inl, hp->x, stdin) < 0)
 			quiterr("error reading RADIANCE file");
+		if (bradj)
+			shiftcolrs(inl, hp->x, bradj);
 		colrs_gambs(inl, hp->x);
 		if (hp->dataBits == 16) {
 			register unsigned short  *dp;
+			register int  v;
 			dp = (unsigned short *)tarData + j*hp->x;
 			for (i = 0; i < hp->x; i++) {
-				*dp = ((inl[i][RED]+(random()&7)) & 0xf8)<<7;
-				*dp |= ((inl[i][GRN]+(random()&7)) & 0xf8)<<2;
-				*dp++ |= (inl[i][BLU]+(random()&7))>>3;
+				v = inl[i][RED] + (random()&7);
+				if (v > 255) v = 255;
+				*dp = (v&0xf8)<<7;
+				v = inl[i][GRN] + (random()&7);
+				if (v > 255) v = 255;
+				*dp |= (v&0xf8)<<2;
+				v = inl[i][BLU] + (random()&7);
+				if (v > 255) v = 255;
+				*dp++ |= v>>3;
 			}
 		} else {	/* hp->dataBits == 24 */
 			register unsigned char  *dp;