--- ray/src/px/ra_pr24.c	1991/04/29 11:14:10	1.6
+++ ray/src/px/ra_pr24.c	1993/11/18 09:55:14	2.7
@@ -1,4 +1,4 @@
-/* Copyright (c) 1990 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -10,14 +10,24 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <stdio.h>
 
+#ifdef MSDOS
+#include  <fcntl.h>
+#endif
+
+#include  <math.h>
+
 #include  "rasterfile.h"
 
 #include  "color.h"
 
-extern double  atof(), pow();
+#include  "resolu.h"
 
-double	gamma = 2.0;			/* gamma correction */
+extern char  *malloc();
 
+double	gamcor = 2.2;			/* gamma correction */
+
+int  bradj = 0;				/* brightness adjustment */
+
 char  *progname;
 
 int  xmax, ymax;
@@ -30,17 +40,31 @@ char  *argv[];
 	struct rasterfile  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.ras_type = RT_STANDARD;
 	for (i = 1; i < argc; i++)
 		if (argv[i][0] == '-')
 			switch (argv[i][1]) {
 			case 'g':
-				gamma = atof(argv[++i]);
+				gamcor = atof(argv[++i]);
 				break;
+			case 'e':
+				if (argv[i+1][0] != '+' && argv[i+1][0] != '-')
+					goto userr;
+				bradj = atoi(argv[++i]);
+				break;
 			case 'r':
-				reverse = !reverse;
+				if (!strcmp(argv[i], "-rgb"))
+					head.ras_type = RT_FORMAT_RGB;
+				else
+					reverse = 1;
 				break;
 			default:
 				goto userr;
@@ -56,11 +80,11 @@ char  *argv[];
 		exit(1);
 	}
 	if (i == argc-2 && freopen(argv[i+1], "w", stdout) == NULL) {
-		fprintf(stderr, "can't open output \"%s\"\n",
+		fprintf(stderr, "%s: can't open output \"%s\"\n",
 				progname, argv[i+1]);
 		exit(1);
 	}
-	setcolrgam(gamma);
+	setcolrgam(gamcor);
 	if (reverse) {
 					/* get header */
 		if (fread((char *)&head, sizeof(head), 1, stdin) != 1)
@@ -78,30 +102,29 @@ char  *argv[];
 		printargs(i, argv, stdout);
 		fputformat(COLRFMT, stdout);
 		putchar('\n');
-		fputresolu(YMAJOR|YDECR, xmax, ymax, stdout);
+		fprtresolu(xmax, ymax, stdout);
 					/* convert file */
-		pr2ra(head.ras_type);
+		pr2ra(head.ras_type, head.ras_length/ymax - xmax*3);
 	} else {
 					/* get header info. */
 		if (checkheader(stdin, COLRFMT, NULL) < 0 ||
-			fgetresolu(&xmax, &ymax, stdin) != (YMAJOR|YDECR))
+				fgetresolu(&xmax, &ymax, stdin) < 0)
 			quiterr("bad picture format");
 					/* write rasterfile header */
 		head.ras_magic = RAS_MAGIC;
-		head.ras_width = xmax;
+		head.ras_width = xmax + (xmax&1);
 		head.ras_height = ymax;
 		head.ras_depth = 24;
-		head.ras_length = xmax*ymax*3;
-		head.ras_type = RT_STANDARD;
+		head.ras_length = head.ras_width*head.ras_height*3;
 		head.ras_maptype = RMT_NONE;
 		head.ras_maplength = 0;
 		fwrite((char *)&head, sizeof(head), 1, stdout);
 					/* convert file */
-		ra2pr();
+		ra2pr(head.ras_type, head.ras_length/ymax - xmax*3);
 	}
 	exit(0);
 userr:
-	fprintf(stderr, "Usage: %s [-r][-g gamma] [input [output]]\n",
+	fprintf(stderr, "Usage: %s [-r][-g gamma][-e +/-stops] [input [output]]\n",
 			progname);
 	exit(1);
 }
@@ -118,8 +141,9 @@ char  *err;
 }
 
 
-pr2ra(rf)		/* convert 24-bit scanlines to Radiance picture */
+pr2ra(rf, pad)		/* convert 24-bit scanlines to Radiance picture */
 int	rf;
+int	pad;
 {
 	COLR	*scanout;
 	register int	x;
@@ -130,19 +154,24 @@ int	rf;
 		quiterr("out of memory in pr2ra");
 						/* convert image */
 	for (y = ymax-1; y >= 0; y--) {
-		for (x = 0; x < xmax; x++)
-			if (rf == RT_FORMAT_RGB) {
+		if (rf == RT_FORMAT_RGB)
+			for (x = 0; x < xmax; x++) {
 				scanout[x][RED] = getc(stdin);
 				scanout[x][GRN] = getc(stdin);
 				scanout[x][BLU] = getc(stdin);
-			} else {
+			}
+		else
+			for (x = 0; x < xmax; x++) {
 				scanout[x][BLU] = getc(stdin);
 				scanout[x][GRN] = getc(stdin);
 				scanout[x][RED] = getc(stdin);
 			}
+		for (x = pad; x--; getc(stdin));
 		if (feof(stdin) || ferror(stdin))
 			quiterr("error reading rasterfile");
 		gambs_colrs(scanout, xmax);
+		if (bradj)
+			shiftcolrs(scanout, xmax, bradj);
 		if (fwritecolrs(scanout, xmax, stdout) < 0)
 			quiterr("error writing Radiance picture");
 	}
@@ -151,25 +180,44 @@ int	rf;
 }
 
 
-ra2pr()			/* convert Radiance scanlines to 24-bit rasterfile */
+ra2pr(rf, pad)		/* convert Radiance scanlines to 24-bit rasterfile */
+int	rf;
+int	pad;
 {
+	int	ord[3];
 	COLR	*scanin;
 	register int	x;
 	int	y;
 						/* allocate scanline */
 	scanin = (COLR *)malloc(xmax*sizeof(COLR));
 	if (scanin == NULL)
-		quiterr("out of memory in pr2ra");
+		quiterr("out of memory in ra2pr");
+	if (rf == RT_FORMAT_RGB) {
+		ord[0] = RED; ord[1] = GRN; ord[2] = BLU;
+	} else {
+		ord[0] = BLU; ord[1] = GRN; ord[2] = RED;
+	}
 						/* convert image */
 	for (y = ymax-1; y >= 0; y--) {
 		if (freadcolrs(scanin, xmax, stdin) < 0)
 			quiterr("error reading Radiance picture");
+		if (bradj)
+			shiftcolrs(scanin, xmax, bradj);
 		colrs_gambs(scanin, xmax);
-		for (x = 0; x < xmax; x++) {
-			putc(scanin[x][BLU], stdout);
-			putc(scanin[x][GRN], stdout);
-			putc(scanin[x][RED], stdout);
-		}
+		if (rf == RT_FORMAT_RGB)
+			for (x = 0; x < xmax; x++) {
+				putc(scanin[x][RED], stdout);
+				putc(scanin[x][GRN], stdout);
+				putc(scanin[x][BLU], stdout);
+			}
+		else
+			for (x = 0; x < xmax; x++) {
+				putc(scanin[x][BLU], stdout);
+				putc(scanin[x][GRN], stdout);
+				putc(scanin[x][RED], stdout);
+			}
+		for (x = 0; x < pad; x++)
+			putc(scanin[xmax-1][ord[x%3]], stdout);
 		if (ferror(stdout))
 			quiterr("error writing rasterfile");
 	}