--- ray/src/px/ra_pr24.c	1991/10/14 17:06:49	1.9
+++ ray/src/px/ra_pr24.c	2003/07/03 22:41:44	2.11
@@ -1,23 +1,22 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: ra_pr24.c,v 2.11 2003/07/03 22:41:44 schorsch Exp $";
 #endif
-
 /*
  *  program to convert between RADIANCE and 24-bit rasterfiles.
  */
 
 #include  <stdio.h>
+#include  <time.h>
+#include  <math.h>
+#include  <string.h>
 
+#include  "platform.h"
 #include  "rasterfile.h"
-
 #include  "color.h"
+#include  "resolu.h"
 
-extern double  atof(), pow();
+double	gamcor = 2.2;			/* gamma correction */
 
-double	gamma = 2.0;			/* gamma correction */
-
 int  bradj = 0;				/* brightness adjustment */
 
 char  *progname;
@@ -32,7 +31,9 @@ char  *argv[];
 	struct rasterfile  head;
 	int  reverse = 0;
 	int  i;
-	
+	SET_DEFAULT_BINARY();
+	SET_FILE_BINARY(stdin);
+	SET_FILE_BINARY(stdout);
 	progname = argv[0];
 
 	head.ras_type = RT_STANDARD;
@@ -40,7 +41,7 @@ char  *argv[];
 		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] != '-')
@@ -67,11 +68,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)
@@ -86,28 +87,29 @@ char  *argv[];
 				|| head.ras_depth != 24)
 			quiterr("incompatible format");
 					/* put header */
+		newheader("RADIANCE", stdout);
 		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_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(head.ras_type);
+		ra2pr(head.ras_type, head.ras_length/ymax - xmax*3);
 	}
 	exit(0);
 userr:
@@ -128,8 +130,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;
@@ -152,6 +155,7 @@ int	rf;
 				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);
@@ -161,13 +165,15 @@ int	rf;
 			quiterr("error writing Radiance picture");
 	}
 						/* free scanline */
-	free((char *)scanout);
+	free((void *)scanout);
 }
 
 
-ra2pr(rf)		/* convert Radiance scanlines to 24-bit rasterfile */
-int  rf;
+ra2pr(rf, pad)		/* convert Radiance scanlines to 24-bit rasterfile */
+int	rf;
+int	pad;
 {
+	int	ord[3];
 	COLR	*scanin;
 	register int	x;
 	int	y;
@@ -175,6 +181,11 @@ int  rf;
 	scanin = (COLR *)malloc(xmax*sizeof(COLR));
 	if (scanin == NULL)
 		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)
@@ -194,9 +205,11 @@ int  rf;
 				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");
 	}
 						/* free scanline */
-	free((char *)scanin);
+	free((void *)scanin);
 }