--- ray/src/common/tmapcolrs.c	1998/10/27 09:32:54	3.8
+++ ray/src/common/tmapcolrs.c	2003/02/25 02:47:22	3.11
@@ -1,22 +1,25 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: tmapcolrs.c,v 3.11 2003/02/25 02:47:22 greg Exp $";
 #endif
-
 /*
  * Routines for tone mapping on Radiance RGBE and XYZE pictures.
- * See tonemap.h for detailed function descriptions.
+ *
+ * Externals declared in tonemap.h
  */
 
+#include "copyright.h"
+
 #include	<stdio.h>
+#include	<string.h>
 #include	<math.h>
+#include	<time.h>
 #include	"tmprivat.h"
 #include	"resolu.h"
 
+#ifndef TM_PIC_CTRANS
+#define TM_PIC_CTRANS	1		/* transform colors? (expensive) */
+#endif
 
-extern char	*tempbuffer();
-
 #define GAMTSZ	1024
 
 typedef struct {
@@ -25,9 +28,13 @@ typedef struct {
 	TMbright	inpsfb;		/* encoded tm->inpsf */
 } COLRDATA;
 
+#ifdef NOPROTO
 static MEM_PTR	colrInit();
 static void	colrNewSpace();
-extern void	free();
+#else
+static MEM_PTR	colrInit(struct tmStruct *);
+static void	colrNewSpace(struct tmStruct *);
+#endif
 static struct tmPackage	colrPkg = {	/* our package functions */
 	colrInit, colrNewSpace, free
 };
@@ -35,7 +42,6 @@ static int	colrReg = -1;		/* our package registration 
 
 #define	LOGISZ	260
 static TMbright	logi[LOGISZ];
-static BYTE	photofact[BMESUPPER-BMESLOWER];
 
 
 int
@@ -54,7 +60,11 @@ int	len;
 		returnErr(TM_E_TMINVAL);
 	if (ls == NULL | scan == NULL | len < 0)
 		returnErr(TM_E_ILLEGAL);
+#if TM_PIC_CTRANS
 	if (tmNeedMatrix(tmTop)) {		/* need floating point */
+#else
+	if (tmTop->inppri == TM_XYZPRIM) {	/* no way around this */
+#endif
 		register COLOR	*newscan;
 		newscan = (COLOR *)tempbuffer(len*sizeof(COLOR));
 		if (newscan == NULL)
@@ -70,11 +80,8 @@ int	len;
 		for (i = 256; i--; )
 			logi[i] = TM_BRTSCALE*log((i+.5)/256.) - .5;
 		for (i = 256; i < LOGISZ; i++)
-			logi[i] = logi[255];
-		for (i = BMESLOWER; i < BMESUPPER; i++)
-			photofact[i-BMESLOWER] = 256. *
-					(tmLuminance(i) - LMESLOWER) /
-					(LMESUPPER - LMESLOWER);
+			logi[i] = 0;
+		tmMkMesofact();
 	}
 	if ((cd = (COLRDATA *)tmPkgData(tmTop,colrReg)) == NULL)
 		returnErr(TM_E_NOMEM);
@@ -84,11 +91,11 @@ int	len;
 		li =  ( cd->clfb[RED]*cmon[RED] +
 			cd->clfb[GRN]*cmon[GRN] +
 			cd->clfb[BLU]*cmon[BLU] ) >> 8;
-		bi = BRT2SCALE*(cmon[EXP]-COLXS) +
+		bi = BRT2SCALE(cmon[EXP]-COLXS) +
 				logi[li] + cd->inpsfb;
-		if (bi < MINBRT) {
-			bi = MINBRT-1;			/* bogus value */
-			li++;				/* avoid li==0 */
+		if (li <= 0) {
+			bi = TM_NOBRT;			/* bogus value */
+			li = 1;				/* avoid li==0 */
 		}
 		ls[i] = bi;
 		if (cs == TM_NOCHROM)			/* no color? */
@@ -101,7 +108,7 @@ int	len;
 			else {
 				if (tmTop->flags & TM_F_BW)
 					cmon[RED] = cmon[GRN] = cmon[BLU] = li;
-				pf = photofact[bi-BMESLOWER];
+				pf = tmMesofact[bi-BMESLOWER];
 				sli *= 256 - pf;
 				cmon[RED] = ( sli + pf*cmon[RED] ) >> 8;
 				cmon[GRN] = ( sli + pf*cmon[GRN] ) >> 8;
@@ -189,7 +196,7 @@ FILE	*fp;
 	*lpp = NULL;
 	if (cpp != TM_NOCHROMP) *cpp = NULL;
 	info = rhdefault;			/* get our header */
-	getheader(inpf, headline, (MEM_PTR)&info);
+	getheader(inpf, headline, (char *)&info);
 	if (info.format == FMTBAD | info.expos <= 0. ||
 			fgetresolu(xp, yp, inpf) < 0) {
 		err = TM_E_BADFILE; goto done;
@@ -242,6 +249,7 @@ done:						/* clean up */
 }
 
 
+#ifdef PCOND
 int					/* run pcond to map picture */
 dopcond(psp, xp, yp, flags, monpri, gamval, Lddyn, Ldmax, fname)
 BYTE	**psp;
@@ -252,7 +260,7 @@ double	gamval, Lddyn, Ldmax;
 char	*fname;
 {
 	char	*funcName = fname;
-	char	cmdbuf[512];
+	char	cmdbuf[1024];
 	FILE	*infp;
 	register COLR	*scan;
 	register BYTE	*rp;
@@ -262,26 +270,26 @@ char	*fname;
 	if (setcolrcor(pow, 1./gamval) < 0)
 		returnErr(TM_E_NOMEM);
 					/* create command */
-	strcpy(cmdbuf, "pcond ");
+	strcpy(cmdbuf, PCOND);
 	if (flags & TM_F_HCONTR)
-		strcat(cmdbuf, "-s ");
+		strcat(cmdbuf, " -s");
 	if (flags & TM_F_MESOPIC)
-		strcat(cmdbuf, "-c ");
+		strcat(cmdbuf, " -c");
 	if (flags & TM_F_LINEAR)
-		strcat(cmdbuf, "-l ");
+		strcat(cmdbuf, " -l");
 	if (flags & TM_F_ACUITY)
-		strcat(cmdbuf, "-a ");
+		strcat(cmdbuf, " -a");
 	if (flags & TM_F_VEIL)
-		strcat(cmdbuf, "-v ");
+		strcat(cmdbuf, " -v");
 	if (flags & TM_F_CWEIGHT)
-		strcat(cmdbuf, "-w ");
-	sprintf(cmdbuf+strlen(cmdbuf),
-			"-p %f %f %f %f %f %f %f %f -d %f -u %f %s",
-			monpri[RED][CIEX], monpri[RED][CIEY],
-			monpri[GRN][CIEX], monpri[GRN][CIEY],
-			monpri[BLU][CIEX], monpri[BLU][CIEY],
-			monpri[WHT][CIEX], monpri[WHT][CIEY],
-			Lddyn, Ldmax, fname);
+		strcat(cmdbuf, " -w");
+	if (monpri != stdprims)
+		sprintf(cmdbuf+strlen(cmdbuf), " -p %f %f %f %f %f %f %f %f",
+				monpri[RED][CIEX], monpri[RED][CIEY],
+				monpri[GRN][CIEX], monpri[GRN][CIEY],
+				monpri[BLU][CIEX], monpri[BLU][CIEY],
+				monpri[WHT][CIEX], monpri[WHT][CIEY]);
+	sprintf(cmdbuf+strlen(cmdbuf), " -d %f -u %f %s", Lddyn, Ldmax, fname);
 					/* start pcond */
 	if ((infp = popen(cmdbuf, "r")) == NULL)
 		returnErr(TM_E_BADFILE);
@@ -325,6 +333,7 @@ char	*fname;
 	pclose(infp);
 	returnOK;
 }
+#endif
 
 
 int					/* map a Radiance picture */
@@ -350,10 +359,12 @@ FILE	*fp;
 	if (Lddyn < MINLDDYN) Lddyn = DEFLDDYN;
 	if (Ldmax < MINLDMAX) Ldmax = DEFLDMAX;
 	if (flags & TM_F_BW) monpri = stdprims;
+#ifdef PCOND
 						/* check for pcond run */
 	if (fp == TM_GETFILE && flags & TM_F_UNIMPL)
 		return( dopcond(psp, xp, yp, flags,
 				monpri, gamval, Lddyn, Ldmax, fname) );
+#endif
 						/* initialize tone mapping */
 	if (tmInit(flags, monpri, gamval) == NULL)
 		returnErr(TM_E_NOMEM);