--- ray/src/px/ra_t8.c	1991/04/18 14:35:45	1.9
+++ ray/src/px/ra_t8.c	1992/10/09 15:24:21	2.3
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -15,12 +15,20 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "color.h"
 
+#include  "resolu.h"
+
 #include  "pic.h"
 
 #include  "targa.h"
 
-#ifndef  BSD
-#define  bcopy(s,d,n)		(void)memcpy(d,s,n)
+#ifdef MSDOS
+#include  <fcntl.h>
+#endif
+
+#include  <math.h>
+
+#ifndef	 BSD
+#define	 bcopy(s,d,n)		(void)memcpy(d,s,n)
 extern char  *memcpy();
 #endif
 			/* descriptor for a picture file or frame buffer */
@@ -35,13 +43,13 @@ typedef struct {
 	} pos;				/* position(s) */
 } pic;
 
-#define  goodpic(h)	(my_imType(h) && my_mapType(h))
-#define  my_imType(h)	(((h)->dataType==IM_CMAP || (h)->dataType==IM_CCMAP) \
+#define	 goodpic(h)	(my_imType(h) && my_mapType(h))
+#define	 my_imType(h)	(((h)->dataType==IM_CMAP || (h)->dataType==IM_CCMAP) \
 				&& (h)->dataBits==8 && (h)->imType==0)
-#define  my_mapType(h)	((h)->mapType==CM_HASMAP && \
+#define	 my_mapType(h)	((h)->mapType==CM_HASMAP && \
 				((h)->CMapBits==24 || (h)->CMapBits==32))
 
-#define  taralloc(h)	(pixel *)emalloc((h)->x*(h)->y*sizeof(pixel))
+#define	 taralloc(h)	(pixel *)emalloc((h)->x*(h)->y*sizeof(pixel))
 
 extern pic	*openinput();
 
@@ -49,9 +57,9 @@ extern char	*ecalloc(), *emalloc();
 
 extern long  ftell();
 
-extern double  atof(), pow();
+double	gamma = 2.2;			/* gamma correction */
 
-double	gamma = 2.0;			/* gamma correction */
+int  bradj = 0;				/* brightness adjustment */
 
 pic	*inpic;
 
@@ -71,13 +79,18 @@ int  argc;
 char  *argv[];
 {
 	colormap  rasmap;
-	struct hdStruct  head;
+	struct hdStruct	 head;
 	int  dither = 1;
 	int  reverse = 0;
 	int  ncolors = 256;
 	int  greyscale = 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];
 
 	for (i = 1; i < argc; i++)
@@ -95,6 +108,11 @@ char  *argv[];
 			case 'b':
 				greyscale = 1;
 				break;
+			case 'e':
+				if (argv[i+1][0] != '+' && argv[i+1][0] != '-')
+					goto userr;
+				bradj = atoi(argv[++i]);
+				break;
 			case 'c':
 				ncolors = atoi(argv[++i]);
 				break;
@@ -127,11 +145,11 @@ char  *argv[];
 		printargs(i, argv, stdout);
 		fputformat(COLRFMT, stdout);
 		putchar('\n');
-		fputresolu(YMAJOR|YDECR, xmax, ymax, stdout);
+		fprtresolu(xmax, ymax, stdout);
 					/* convert file */
 		tg2ra(&head);
 	} else {
-		if (i > argc-1 || i < argc-2)
+		if (i < argc-2 || (!greyscale && i > argc-1))
 			goto userr;
 		if ((inpic = openinput(argv[i], &head)) == NULL) {
 			sprintf(errmsg, "can't open input \"%s\"", argv[i]);
@@ -154,9 +172,9 @@ char  *argv[];
 	quiterr(NULL);
 userr:
 	fprintf(stderr,
-	"Usage: %s [-d][-c ncolors][-b][-g gamma] input [output]\n",
+	"Usage: %s [-d][-c ncolors][-b][-g gamma][-e +/-stops] input [output]\n",
 			progname);
-	fprintf(stderr, "   Or: %s -r [-g gamma] [input [output]]\n",
+	fprintf(stderr, "   Or: %s -r [-g gamma][-e +/-stops] [input [output]]\n",
 			progname);
 	exit(1);
 }
@@ -210,7 +228,7 @@ int code;
 
 
 getthead(hp, ip, fp)		/* read header from input */
-struct hdStruct  *hp;
+struct hdStruct	 *hp;
 char  *ip;
 register FILE  *fp;
 {
@@ -243,7 +261,7 @@ register FILE  *fp;
 
 
 putthead(hp, ip, fp)		/* write header to output */
-struct hdStruct  *hp;
+struct hdStruct	 *hp;
 char  *ip;
 register FILE  *fp;
 {
@@ -285,7 +303,7 @@ register struct hdStruct  *h;
 		return(NULL);
 					/* get header info. */
 	if (checkheader(p->fp, COLRFMT, NULL) < 0 ||
-			fgetresolu(&xmax, &ymax, p->fp) != (YMAJOR|YDECR))
+			fgetresolu(&xmax, &ymax, p->fp) < 0)
 		quiterr("bad picture format");
 	p->nexty = 0;
 	p->bytes_line = 0;		/* variable length lines */
@@ -314,7 +332,7 @@ register struct hdStruct  *h;
 
 
 tg2ra(hp)			/* targa file to RADIANCE file */
-struct hdStruct  *hp;
+struct hdStruct	 *hp;
 {
 	union {
 		BYTE  c3[256][3];
@@ -325,8 +343,10 @@ struct hdStruct  *hp;
 	register int  i, j;
 
 					/* get color table */
-	if ((hp->CMapBits==24 ? fread((char *)map.c3,sizeof(map.c3),1,stdin) :
-			fread((char *)map.c4,sizeof(map.c4),1,stdin)) != 1)
+	if ((hp->CMapBits==24 ? fread((char *)(map.c3+hp->mapOrig),
+				3*hp->mapLength,1,stdin) :
+			fread((char *)(map.c4+hp->mapOrig),
+				4*hp->mapLength,1,stdin)) != 1)
 		quiterr("error reading color table");
 					/* convert table */
 	for (i = hp->mapOrig; i < hp->mapOrig+hp->mapLength; i++)
@@ -340,7 +360,8 @@ struct hdStruct  *hp;
 					pow((map.c4[i][3]+.5)/256.,gamma),
 					pow((map.c4[i][2]+.5)/256.,gamma),
 					pow((map.c4[i][1]+.5)/256.,gamma));
-
+	if (bradj)
+		shiftcolrs(ctab, 256, bradj);
 					/* allocate targa data */
 	tarData = taralloc(hp);
 					/* get data */
@@ -383,7 +404,7 @@ register rgbpixel  *l3;
 		quiterr("read error in picreadline3");
 	inpic->nexty = y+1;
 							/* convert scanline */
-	normcolrs(inl, xmax, 0);
+	normcolrs(inl, xmax, bradj);
 	for (i = 0; i < xmax; i++) {
 		l3[i].r = inl[i][RED];
 		l3[i].g = inl[i][GRN];
@@ -401,7 +422,7 @@ pixel  *l;
 
 
 writetarga(h, d, fp)		/* write out targa data */
-struct hdStruct  *h;
+struct hdStruct	 *h;
 pixel  *d;
 FILE  *fp;
 {
@@ -415,7 +436,7 @@ FILE  *fp;
 
 
 readtarga(h, data, fp)		/* read in targa data */
-struct hdStruct  *h;
+struct hdStruct	 *h;
 pixel  *data;
 FILE  *fp;
 {