--- ray/src/px/normtiff.c	1998/10/27 08:54:37	3.3
+++ ray/src/px/normtiff.c	2003/07/14 04:56:54	3.5
@@ -1,18 +1,13 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: normtiff.c,v 3.5 2003/07/14 04:56:54 greg Exp $";
 #endif
-
 /*
  * Tone map SGILOG TIFF or Radiance picture and output 24-bit RGB TIFF
  */
 
-#undef NOPROTO
-#define NOPROTO	1
-
 #include <stdio.h>
 #include <math.h>
+#include <time.h>
 #include "tiffio.h"
 #include "color.h"
 #include "tonemap.h"
@@ -47,7 +42,7 @@ typedef struct {
 
 extern PICTURE	*openpicture();
 
-#define closepicture(p)		(fclose((p)->fp),free((char *)(p)))
+#define closepicture(p)		(fclose((p)->fp),free((void *)(p)))
 
 
 main(argc, argv)
@@ -175,7 +170,7 @@ char	*fname;
 		return(NULL);		/* serious error -- should exit? */
 	pp->fp = fp; pp->fmt[0] = '\0'; pp->pa = 1.;
 					/* load header */
-	if (getheader(fp, headline, pp) < 0) {
+	if (getheader(fp, headline, (char *)pp) < 0) {
 		closepicture(pp);
 		return(NULL);
 	}
@@ -204,7 +199,7 @@ register PICTURE	*pp;
 		return(-1);
 					/* figure out TIFF orientation */
 	for (orient = 8; --orient; )
-		if (ortab[orient] == pp->rs.or)
+		if (ortab[orient] == pp->rs.rt)
 			break;
 	orient++;
 					/* put out our image */
@@ -212,7 +207,7 @@ register PICTURE	*pp;
 			72., 72./pp->pa, 2, pix) != 0)
 		return(-1);
 					/* free data and we're done */
-	free((char *)pix);
+	free((void *)pix);
 	return(0);
 }
 
@@ -227,14 +222,7 @@ TIFF	*tp;
 	BYTE	*pix;
 					/* check to make sure it's SGILOG */
 	TIFFGetFieldDefaulted(tp, TIFFTAG_PHOTOMETRIC, &phot);
-	if (phot != PHOTOMETRIC_LOGLUV && phot != PHOTOMETRIC_LOGL) {
-		if (!(flags & TM_F_NOSTDERR)) {
-			fputs(fname, stderr);
-			fputs(": TIFF must be in SGILOG format\n", stderr);
-		}
-		return(-1);
-	}
-	if (phot == PHOTOMETRIC_LOGL)
+	if (phot == PHOTOMETRIC_LOGL | phot == PHOTOMETRIC_MINISBLACK)
 		flags |= TM_F_BW;
 					/* read and tone map TIFF */
 	if (tmMapTIFF(&pix, &xsiz, &ysiz, flags,
@@ -250,7 +238,7 @@ TIFF	*tp;
 			xres, yres, resunit, pix) != 0)
 		return(-1);
 					/* free data and we're done */
-	free((char *)pix);
+	free((void *)pix);
 	return(0);
 }