--- ray/src/px/ra_pr24.c	1992/09/23 09:17:53	2.4
+++ ray/src/px/ra_pr24.c	2003/06/05 19:29:34	2.10
@@ -1,31 +1,21 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: ra_pr24.c,v 2.10 2003/06/05 19:29:34 schorsch Exp $";
 #endif
-
 /*
  *  program to convert between RADIANCE and 24-bit rasterfiles.
  */
 
 #include  <stdio.h>
+#include  <time.h>
+#include  <math.h>
 
-#ifdef MSDOS
-#include  <fcntl.h>
-#endif
-
+#include  "platform.h"
 #include  "rasterfile.h"
-
 #include  "color.h"
-
 #include  "resolu.h"
 
-extern double  pow();
+double	gamcor = 2.2;			/* gamma correction */
 
-extern char  *malloc();
-
-double	gamma = 2.2;			/* gamma correction */
-
 int  bradj = 0;				/* brightness adjustment */
 
 char  *progname;
@@ -40,12 +30,9 @@ 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
+	SET_DEFAULT_BINARY();
+	SET_FILE_BINARY(stdin);
+	SET_FILE_BINARY(stdout);
 	progname = argv[0];
 
 	head.ras_type = RT_STANDARD;
@@ -53,7 +40,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] != '-')
@@ -80,11 +67,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)
@@ -99,6 +86,7 @@ char  *argv[];
 				|| head.ras_depth != 24)
 			quiterr("incompatible format");
 					/* put header */
+		newheader("RADIANCE", stdout);
 		printargs(i, argv, stdout);
 		fputformat(COLRFMT, stdout);
 		putchar('\n');
@@ -176,7 +164,7 @@ int	pad;
 			quiterr("error writing Radiance picture");
 	}
 						/* free scanline */
-	free((char *)scanout);
+	free((void *)scanout);
 }
 
 
@@ -222,5 +210,5 @@ int	pad;
 			quiterr("error writing rasterfile");
 	}
 						/* free scanline */
-	free((char *)scanin);
+	free((void *)scanin);
 }