--- ray/src/px/ra_tiff.c	2003/07/01 19:04:08	2.21
+++ ray/src/px/ra_tiff.c	2005/08/19 02:31:32	2.32
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: ra_tiff.c,v 2.21 2003/07/01 19:04:08 greg Exp $";
+static const char	RCSid[] = "$Id: ra_tiff.c,v 2.32 2005/08/19 02:31:32 greg Exp $";
 #endif
 /*
  *  Program to convert between RADIANCE and TIFF files.
@@ -9,7 +9,10 @@ static const char	RCSid[] = "$Id: ra_tiff.c,v 2.21 200
 
 #include  <stdio.h>
 #include  <math.h>
+#include  <ctype.h>
 #include  <time.h>
+#include  <string.h>
+
 #include  "tiffio.h"
 #include  "color.h"
 #include  "resolu.h"
@@ -27,8 +30,12 @@ static const char	RCSid[] = "$Id: ra_tiff.c,v 2.21 200
 #define C_TWRD		0x80		/* TIFF data is 16-bit */
 #define C_PRIM		0x100		/* has assigned primaries */
 
+typedef void colcvf_t(uint32 y);
+
 struct {
 	uint16	flags;		/* conversion flags (defined above) */
+	char	capdate[20];	/* capture date/time */
+	char	owner[256];	/* content owner */
 	uint16	comp;		/* TIFF compression type */
 	uint16	phot;		/* TIFF photometric type */
 	uint16	pconf;		/* TIFF planar configuration */
@@ -53,9 +60,9 @@ struct {
 		float	*fp;		/* float pointer */
 		char	*p;		/* generic pointer */
 	} t;			/* TIFF scanline */
-	void	(*tf)();	/* translation procedure */
+	colcvf_t *tf;	/* translation procedure */
 }	cvts = {	/* conversion structure */
-	0, COMPRESSION_NONE, PHOTOMETRIC_RGB,
+	0, "", "", COMPRESSION_NONE, PHOTOMETRIC_RGB,
 	PLANARCONFIG_CONTIG, GAMCOR, 0, 1, 1., 1.,
 };
 
@@ -64,10 +71,20 @@ struct {
 #define CLR(f)		(cvts.flags &= ~(f))
 #define TGL(f)		(cvts.flags ^= (f))
 
-void	Luv2Color(), L2Color(), RGB2Colr(), Gry2Colr();
-void	Color2Luv(), Color2L(), Colr2RGB(), Colr2Gry();
-void	RRGGBB2Color(), GGry2Color(), Color2RRGGBB(), Color2GGry();
+static colcvf_t Luv2Color, L2Color, RGB2Colr, Gry2Colr;
+static colcvf_t Color2Luv, Color2L, Colr2RGB, Colr2Gry;
+static colcvf_t RRGGBB2Color, GGry2Color, Color2RRGGBB, Color2GGry;
 
+static gethfunc headline;
+static void quiterr(char *err);
+static void allocbufs(void);
+static void initfromtif(void);
+static void tiff2ra(int  ac, char  *av[]);
+static void initfromrad(void);
+static void ra2tiff(int  ac, char  *av[]);
+
+
+
 #define RfGfBf2Color	Luv2Color
 #define Gryf2Color	L2Color
 #define	Color2Gryf	Color2L
@@ -86,12 +103,14 @@ short	ortab[8] = {		/* orientation conversion table */
 
 #define pixorder()	ortab[cvts.orient-1]
 
+extern char	TMSTR[];	/* "CAPDATE=" from header.c */
+char		OWNSTR[] = "OWNER=";
+
 char  *progname;
 
 
-main(argc, argv)
-int  argc;
-char  *argv[];
+int
+main(int  argc, char  *argv[])
 {
 	int  reverse = 0;
 	int  i;
@@ -155,13 +174,14 @@ doneopts:
 		if (i != argc-2)
 			goto userr;
 						/* consistency checks */
-		if (CHK(C_GRY))
+		if (CHK(C_GRY)) {
 			if (cvts.phot == PHOTOMETRIC_RGB)
 				cvts.phot = PHOTOMETRIC_MINISBLACK;
 			else {
 				cvts.phot = PHOTOMETRIC_LOGL;
 				cvts.comp = COMPRESSION_SGILOG;
 			}
+		}
 		if (CHK(C_TWRD|C_TFLT) == (C_TWRD|C_TFLT))
 			goto userr;
 
@@ -180,8 +200,10 @@ userr:
 }
 
 
-quiterr(err)		/* print message and exit */
-char  *err;
+static void
+quiterr(		/* print message and exit */
+	char  *err
+)
 {
 	if (err != NULL) {
 		fprintf(stderr, "%s: %s\n", progname, err);
@@ -191,7 +213,8 @@ char  *err;
 }
 
 
-allocbufs()			/* allocate scanline buffers */
+static void
+allocbufs(void)			/* allocate scanline buffers */
 {
 	int	rsiz, tsiz;
 
@@ -201,14 +224,16 @@ allocbufs()			/* allocate scanline buffers */
 			(CHK(C_GRY) ? 1 : 3);
 	cvts.r.p = (char *)malloc(rsiz*cvts.xmax);
 	cvts.t.p = (char *)malloc(tsiz*cvts.xmax);
-	if (cvts.r.p == NULL | cvts.t.p == NULL)
+	if ((cvts.r.p == NULL) | (cvts.t.p == NULL))
 		quiterr("no memory to allocate scanline buffers");
 }
 
 
-initfromtif()		/* initialize conversion from TIFF input */
+static void
+initfromtif(void)		/* initialize conversion from TIFF input */
 {
 	uint16	hi;
+	char	*cp;
 	float	*fa, f1, f2;
 
 	CLR(C_GRY|C_GAMMA|C_PRIM|C_RFLT|C_TFLT|C_TWRD|C_CXFM);
@@ -250,7 +275,7 @@ initfromtif()		/* initialize conversion from TIFF inpu
 			cpcolormat(cvts.cmat, xyz2rgbmat);
 			SET(C_CXFM|C_GAMUT);
 		} else if (cvts.comp == COMPRESSION_SGILOG)
-			SET(C_GAMUT);
+			SET(C_GAMUT);		/* may be outside XYZ gamut */
 		if (cvts.pconf != PLANARCONFIG_CONTIG)
 			quiterr("cannot handle separate Luv planes");
 		TIFFSetField(cvts.tif, TIFFTAG_SGILOGDATAFMT,
@@ -337,28 +362,49 @@ initfromtif()		/* initialize conversion from TIFF inpu
 		quiterr("unknown input image resolution");
 
 	if (!TIFFGetField(cvts.tif, TIFFTAG_STONITS, &cvts.stonits))
-		cvts.stonits = 1.;
+		cvts.stonits = -1.;
+
+	if (!TIFFGetField(cvts.tif, TIFFTAG_DATETIME, &cp))
+		cvts.capdate[0] = '\0';
+	else {
+		strncpy(cvts.capdate, cp, 19);
+		cvts.capdate[19] = '\0';
+	}
+	if (!TIFFGetField(cvts.tif, TIFFTAG_ARTIST, &cp))
+		cvts.owner[0] = '\0';
+	else {
+		strncpy(cvts.owner, cp, sizeof(cvts.owner));
+		cvts.owner[sizeof(cvts.owner)-1] = '\0';
+	}
 					/* add to Radiance header */
 	if (cvts.pixrat < .99 || cvts.pixrat > 1.01)
 		fputaspect(cvts.pixrat, cvts.rfp);
 	if (CHK(C_XYZE)) {
-		fputexpos(pow(2.,(double)cvts.bradj)/cvts.stonits, cvts.rfp);
+		if (cvts.stonits > .0)
+			fputexpos(pow(2.,(double)cvts.bradj)/cvts.stonits, cvts.rfp);
 		fputformat(CIEFMT, cvts.rfp);
 	} else {
 		if (CHK(C_PRIM))
 			fputprims(cvts.prims, cvts.rfp);
-		fputexpos(WHTEFFICACY*pow(2.,(double)cvts.bradj)/cvts.stonits,
-				cvts.rfp);
+		if (cvts.stonits > .0)
+			fputexpos(WHTEFFICACY*pow(2.,(double)cvts.bradj)/cvts.stonits,
+					cvts.rfp);
 		fputformat(COLRFMT, cvts.rfp);
 	}
+	if (cvts.capdate[0])
+		fprintf(cvts.rfp, "%s %s\n", TMSTR, cvts.capdate);
+	if (cvts.owner[0])
+		fprintf(cvts.rfp, "%s %s\n", OWNSTR, cvts.owner);
 
 	allocbufs();			/* allocate scanline buffers */
 }
 
 
-tiff2ra(ac, av)		/* convert TIFF image to Radiance picture */
-int  ac;
-char  *av[];
+static void
+tiff2ra(		/* convert TIFF image to Radiance picture */
+	int  ac,
+	char  *av[]
+)
 {
 	int32	y;
 					/* open TIFF input */
@@ -386,12 +432,20 @@ char  *av[];
 }
 
 
-int
-headline(s)			/* process Radiance input header line */
-char	*s;
+static int
+headline(			/* process Radiance input header line */
+	char	*s,
+	void	*p
+)
 {
+	static int	tmstrlen = 0;
+	static int	ownstrlen = 0;
 	char	fmt[32];
 
+	if (!tmstrlen)
+		tmstrlen = strlen(TMSTR);
+	if (!ownstrlen)
+		ownstrlen = strlen(OWNSTR);
 	if (formatval(fmt, s)) {
 		if (!strcmp(fmt, COLRFMT))
 			CLR(C_XYZE);
@@ -414,15 +468,39 @@ char	*s;
 		SET(C_PRIM);
 		return(1);
 	}
+	if (isdate(s)) {
+		if (s[tmstrlen] == ' ')
+			strncpy(cvts.capdate, s+tmstrlen+1, 19);
+		else
+			strncpy(cvts.capdate, s+tmstrlen, 19);
+		cvts.capdate[19] = '\0';
+		return(1);
+	}
+	if (!strncmp(s, OWNSTR, ownstrlen)) {
+		register char	*cp = s + ownstrlen;
+
+		while (isspace(*cp))
+			++cp;
+		strncpy(cvts.owner, cp, sizeof(cvts.owner));
+		cvts.owner[sizeof(cvts.owner)-1] = '\0';
+		for (cp = cvts.owner; *cp; cp++)
+			;
+		while (cp > cvts.owner && isspace(cp[-1]))
+			*--cp = '\0';
+		return(1);
+	}
 	return(0);
 }
 
 
-initfromrad()			/* initialize input from a Radiance picture */
+static void
+initfromrad(void)			/* initialize input from a Radiance picture */
 {
 	int	i1, i2, po;
 						/* read Radiance header */
 	CLR(C_RFLT|C_XYZE|C_PRIM|C_GAMMA|C_CXFM);
+	cvts.capdate[0] = '\0';
+	cvts.owner[0] = '\0';
 	cvts.stonits = 1.;
 	cvts.pixrat = 1.;
 	cvts.pconf = PLANARCONFIG_CONTIG;
@@ -489,8 +567,11 @@ initfromrad()			/* initialize input from a Radiance pi
 			cvts.tf = Color2RRGGBB;
 			SET(C_RFLT);
 		} else if (CHK(C_TFLT)) {
+			TIFFSetField(cvts.tif, TIFFTAG_SAMPLEFORMAT,
+					SAMPLEFORMAT_IEEEFP);
 			cvts.tf = Color2RfGfBf;
 			SET(C_RFLT);
+			CLR(C_GAMUT);
 		} else
 			cvts.tf = Colr2RGB;
 		break;
@@ -501,6 +582,8 @@ initfromrad()			/* initialize input from a Radiance pi
 			cvts.tf = Color2GGry;
 			SET(C_RFLT);
 		} else if (CHK(C_TFLT)) {
+			TIFFSetField(cvts.tif, TIFFTAG_SAMPLEFORMAT,
+					SAMPLEFORMAT_IEEEFP);
 			cvts.tf = Color2Gryf;
 			SET(C_RFLT);
 		} else
@@ -523,6 +606,10 @@ initfromrad()			/* initialize input from a Radiance pi
 	TIFFSetField(cvts.tif, TIFFTAG_PLANARCONFIG, cvts.pconf);
 	TIFFSetField(cvts.tif, TIFFTAG_STONITS,
 			cvts.stonits/pow(2.,(double)cvts.bradj));
+	if (cvts.capdate[0])
+		TIFFSetField(cvts.tif, TIFFTAG_DATETIME, cvts.capdate);
+	if (cvts.owner[0])
+		TIFFSetField(cvts.tif, TIFFTAG_ARTIST, cvts.owner);
 	if (cvts.comp == COMPRESSION_NONE)
 		i1 = TIFFScanlineSize(cvts.tif);
 	else
@@ -535,9 +622,11 @@ initfromrad()			/* initialize input from a Radiance pi
 }
 
 
-ra2tiff(ac, av)		/* convert Radiance picture to TIFF image */
-int  ac;
-char  *av[];
+static void
+ra2tiff(		/* convert Radiance picture to TIFF image */
+	int  ac,
+	char  *av[]
+)
 {
 	uint32	y;
 						/* open Radiance file */
@@ -559,15 +648,19 @@ char  *av[];
 }
 
 
-void
-Luv2Color(y)			/* read/convert/write Luv->COLOR scanline */
-uint32	y;
+static void
+Luv2Color(			/* read/convert/write Luv->COLOR scanline */
+	uint32	y
+)
 {
 	register int	x;
 
 	if (CHK(C_RFLT|C_TWRD|C_TFLT|C_GRY) != (C_RFLT|C_TFLT))
 		quiterr("internal error 1 in Luv2Color");
 
+	if (cvts.pconf != PLANARCONFIG_CONTIG)
+		quiterr("cannot handle separate 32-bit color planes");
+
 	if (TIFFReadScanline(cvts.tif, cvts.t.p, y, 0) < 0)
 		quiterr("error reading TIFF input");
 					/* also works for float RGB */
@@ -594,17 +687,21 @@ uint32	y;
 }
 
 
-void
-RRGGBB2Color(y)			/* read/convert/write RGB16->COLOR scanline */
-uint32	y;
+static void
+RRGGBB2Color(			/* read/convert/write RGB16->COLOR scanline */
+	uint32	y
+)
 {
-	int	dogamma = cvts.gamcor < 0.99 | cvts.gamcor > 1.01;
+	int	dogamma = (cvts.gamcor < 0.99) | (cvts.gamcor > 1.01);
 	register double	d;
 	register int	x;
 
 	if (CHK(C_RFLT|C_TWRD|C_TFLT|C_GRY) != (C_TWRD|C_RFLT))
 		quiterr("internal error 1 in RRGGBB2Color");
 
+	if (cvts.pconf != PLANARCONFIG_CONTIG)
+		quiterr("cannot handle separate 16-bit color planes");
+
 	if (TIFFReadScanline(cvts.tif, cvts.t.p, y, 0) < 0)
 		quiterr("error reading TIFF input");
 	
@@ -621,9 +718,6 @@ uint32	y;
 		if (CHK(C_CXFM))
 			colortrans(cvts.r.colors[x], cvts.cmat,
 					cvts.r.colors[x]);
-		if (CHK(C_GAMUT))
-			clipgamut(cvts.r.colors[x], cvts.t.fp[3*x + 1],
-					CGAMUT_LOWER, cblack, cwhite);
 	}
 	if (cvts.bradj) {
 		d = pow(2.,(double)cvts.bradj);
@@ -636,9 +730,10 @@ uint32	y;
 }
 
 
-void
-L2Color(y)			/* read/convert/write Lfloat->COLOR scanline */
-uint32	y;
+static void
+L2Color(			/* read/convert/write Lfloat->COLOR scanline */
+	uint32	y
+)
 {
 	float	m = pow(2., (double)cvts.bradj);
 	register int	x;
@@ -659,9 +754,10 @@ uint32	y;
 }
 
 
-void
-RGB2Colr(y)			/* read/convert/write RGB->COLR scanline */
-uint32	y;
+static void
+RGB2Colr(			/* read/convert/write RGB->COLR scanline */
+	uint32	y
+)
 {
 	COLOR	ctmp;
 	register int	x;
@@ -715,9 +811,10 @@ readerr:
 }
 
 
-void
-Gry2Colr(y)			/* read/convert/write G8->COLR scanline */
-uint32	y;
+static void
+Gry2Colr(			/* read/convert/write G8->COLR scanline */
+	uint32	y
+)
 {
 	register int	x;
 
@@ -741,11 +838,12 @@ uint32	y;
 }
 
 
-void
-GGry2Color(y)			/* read/convert/write G16->COLOR scanline */
-uint32	y;
+static void
+GGry2Color(			/* read/convert/write G16->COLOR scanline */
+	uint32	y
+)
 {
-	int	dogamma = cvts.gamcor < 0.99 | cvts.gamcor > 1.01;
+	int	dogamma = (cvts.gamcor < 0.99) | (cvts.gamcor > 1.01);
 	double	m;
 	register double	d;
 	register int	x;
@@ -771,11 +869,12 @@ uint32	y;
 }
 
 
-void
-Color2GGry(y)			/* read/convert/write COLOR->G16 scanline */
-uint32	y;
+static void
+Color2GGry(			/* read/convert/write COLOR->G16 scanline */
+	uint32	y
+)
 {
-	int	dogamma = cvts.gamcor < 0.99 | cvts.gamcor > 1.01;
+	int	dogamma = (cvts.gamcor < 0.99) | (cvts.gamcor > 1.01);
 	float	m = pow(2.,(double)cvts.bradj);
 	register int	x;
 
@@ -805,9 +904,10 @@ uint32	y;
 }
 
 
-void
-Color2L(y)			/* read/convert/write COLOR->Lfloat scanline */
-uint32	y;
+static void
+Color2L(			/* read/convert/write COLOR->Lfloat scanline */
+	uint32	y
+)
 {
 	float	m = pow(2.,(double)cvts.bradj);
 	register int	x;
@@ -827,9 +927,10 @@ uint32	y;
 }
 
 
-void
-Color2Luv(y)			/* read/convert/write COLOR->Luv scanline */
-uint32	y;
+static void
+Color2Luv(			/* read/convert/write COLOR->Luv scanline */
+	uint32	y
+)
 {
 	register int	x;
 
@@ -860,11 +961,12 @@ uint32	y;
 }
 
 
-void
-Color2RRGGBB(y)			/* read/convert/write COLOR->RGB16 scanline */
-uint32	y;
+static void
+Color2RRGGBB(			/* read/convert/write COLOR->RGB16 scanline */
+	uint32	y
+)
 {
-	int	dogamma = cvts.gamcor < 0.99 | cvts.gamcor > 1.01;
+	int	dogamma = (cvts.gamcor < 0.99) | (cvts.gamcor > 1.01);
 	float	m = pow(2.,(double)cvts.bradj);
 	register int	x, i;
 
@@ -874,7 +976,14 @@ uint32	y;
 	if (freadscan(cvts.r.colors, cvts.xmax, cvts.rfp) < 0)
 		quiterr("error reading Radiance picture");
 
-	for (x = cvts.xmax; x--; )
+	for (x = cvts.xmax; x--; ) {
+	    if (CHK(C_CXFM)) {
+			colortrans(cvts.r.colors[x], cvts.cmat,
+					cvts.r.colors[x]);
+		if (CHK(C_GAMUT))
+			clipgamut(cvts.r.colors[x], bright(cvts.r.colors[x]),
+					CGAMUT_LOWER, cblack, cwhite);
+	    }
 	    for (i = 3; i--; ) {
 		register float	f = m*colval(cvts.r.colors[x],i);
 		if (f <= 0)
@@ -887,15 +996,17 @@ uint32	y;
 		else
 			cvts.t.wp[3*x + i] = (int)((float)(1L<<16)*f);
 	    }
+	}
 
 	if (TIFFWriteScanline(cvts.tif, cvts.t.p, y, 0) < 0)
 		quiterr("error writing TIFF output");
 }
 
 
-void
-Colr2Gry(y)			/* read/convert/write COLR->RGB scanline */
-uint32	y;
+static void
+Colr2Gry(			/* read/convert/write COLR->RGB scanline */
+	uint32	y
+)
 {
 	register int	x;
 
@@ -919,9 +1030,10 @@ uint32	y;
 }
 
 
-void
-Colr2RGB(y)			/* read/convert/write COLR->RGB scanline */
-uint32	y;
+static void
+Colr2RGB(			/* read/convert/write COLR->RGB scanline */
+	uint32	y
+)
 {
 	COLOR	ctmp;
 	register int	x;