--- ray/src/common/tmapcolrs.c	2005/01/07 22:05:30	3.19
+++ ray/src/common/tmapcolrs.c	2011/06/28 21:11:04	3.30
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: tmapcolrs.c,v 3.19 2005/01/07 22:05:30 greg Exp $";
+static const char	RCSid[] = "$Id: tmapcolrs.c,v 3.30 2011/06/28 21:11:04 greg Exp $";
 #endif
 /*
  * Routines for tone mapping on Radiance RGBE and XYZE pictures.
@@ -10,23 +10,23 @@ static const char	RCSid[] = "$Id: tmapcolrs.c,v 3.19 2
 #include "copyright.h"
 
 #include	<stdio.h>
+#include	<stdlib.h>
 #include	<string.h>
 #include	<math.h>
 #include	<time.h>
 
+#ifdef PCOND
+#include	"rtprocess.h"
+#endif
 #include	"tmprivat.h"
 #include	"resolu.h"
-#include	"rtprocess.h"
 
-#ifndef TM_PIC_CTRANS
-#define TM_PIC_CTRANS	1		/* transform colors? (expensive) */
-#endif
+#define GAMTSZ	4096
 
-#define GAMTSZ	1024
-
 typedef struct {
-	BYTE		gamb[GAMTSZ];	/* gamma lookup table */
-	COLR		clfb;		/* encoded tm->clf */
+	uby8		gamb[GAMTSZ];	/* gamma lookup table */
+	int		clfb[3];	/* encoded tm->clf */
+	int32		cmatb[3][3];	/* encoded color transform */
 	TMbright	inpsfb;		/* encoded tm->inpsf */
 } COLRDATA;
 
@@ -39,90 +39,93 @@ static struct tmPackage	colrPkg = {	/* our package fun
 };
 static int	colrReg = -1;		/* our package registration number */
 
-#define	LOGISZ	260
-static TMbright	logi[LOGISZ];
+static TMbright	logi[256];
 
 
 int
 tmCvColrs(				/* convert RGBE/XYZE colors */
 TMstruct	*tms,
 TMbright	*ls,
-BYTE	*cs,
+uby8	*cs,
 COLR	*scan,
 int	len
 )
 {
 	static const char	funcName[] = "tmCvColrs";
-	COLR	cmon;
-	register COLRDATA	*cd;
-	register int	i, bi, li;
+	int	cmon[4];
+	COLRDATA	*cd;
+	int	i, j, bi;
+	int32	li, vl;
 
 	if (tms == NULL)
 		returnErr(TM_E_TMINVAL);
 	if ((ls == NULL) | (scan == NULL) | (len < 0))
 		returnErr(TM_E_ILLEGAL);
-#if TM_PIC_CTRANS
-	if (tmNeedMatrix(tms)) {		/* need floating point */
-#else
-	if (tms->inppri == TM_XYZPRIM) {	/* no way around this */
-#endif
-		register COLOR	*newscan;
-		newscan = (COLOR *)tempbuffer(len*sizeof(COLOR));
-		if (newscan == NULL)
-			returnErr(TM_E_NOMEM);
-		for (i = len; i--; )
-			colr_color(newscan[i], scan[i]);
-		return(tmCvColors(tms, ls, cs, newscan, len));
-	}
 	if (colrReg < 0) {			/* build tables if necessary */
 		colrReg = tmRegPkg(&colrPkg);
 		if (colrReg < 0)
 			returnErr(TM_E_CODERR1);
 		for (i = 256; i--; )
 			logi[i] = TM_BRTSCALE*log((i+.5)/256.) - .5;
-		for (i = 256; i < LOGISZ; i++)
-			logi[i] = 0;
 		tmMkMesofact();
 	}
 	if ((cd = (COLRDATA *)tmPkgData(tms,colrReg)) == NULL)
 		returnErr(TM_E_NOMEM);
 	for (i = len; i--; ) {
-		copycolr(cmon, scan[i]);
+		if (tmNeedMatrix(tms)) {		/* apply color xform */
+			for (j = 3; j--; ) {
+				vl =	cd->cmatb[j][RED]*(int32)scan[i][RED] +
+					cd->cmatb[j][GRN]*(int32)scan[i][GRN] +
+					cd->cmatb[j][BLU]*(int32)scan[i][BLU] ;
+				if (vl < 0) cmon[j] = vl/0x10000;
+				else cmon[j] = vl>>16;
+			}
+			cmon[EXP] = scan[i][EXP];
+		} else
+			copycolr(cmon, scan[i]);
 							/* world luminance */
-		li =  ( cd->clfb[RED]*cmon[RED] +
-			cd->clfb[GRN]*cmon[GRN] +
-			cd->clfb[BLU]*cmon[BLU] ) >> 8;
-		bi = BRT2SCALE(cmon[EXP]-COLXS) +
-				logi[li] + cd->inpsfb;
-		if (li <= 0) {
-			bi = TM_NOBRT;			/* bogus value */
-			li = 1;				/* avoid li==0 */
+		li =	cd->clfb[RED]*(int32)cmon[RED] +
+			cd->clfb[GRN]*(int32)cmon[GRN] +
+			cd->clfb[BLU]*(int32)cmon[BLU] ;
+		if (li >= 1L<<(12+8)) li = 255;
+		else li >>= 12;
+		bi = BRT2SCALE(cmon[EXP]-COLXS) + cd->inpsfb;
+		if (li > 0)
+			bi += logi[li];
+		else {
+			bi += logi[0];
+			li = 1;				/* avoid /0 */
 		}
 		ls[i] = bi;
 		if (cs == TM_NOCHROM)			/* no color? */
 			continue;
 							/* mesopic adj. */
 		if (tms->flags & TM_F_MESOPIC && bi < BMESUPPER) {
-			register int	pf, sli = normscot(cmon);
-			if (bi < BMESLOWER)
+			int	pf, sli = normscot(cmon);
+			if (bi < BMESLOWER) {
 				cmon[RED] = cmon[GRN] = cmon[BLU] = sli;
-			else {
+			} else {
 				if (tms->flags & TM_F_BW)
 					cmon[RED] = cmon[GRN] = cmon[BLU] = li;
 				pf = tmMesofact[bi-BMESLOWER];
 				sli *= 256 - pf;
-				cmon[RED] = ( sli + pf*cmon[RED] ) >> 8;
-				cmon[GRN] = ( sli + pf*cmon[GRN] ) >> 8;
-				cmon[BLU] = ( sli + pf*cmon[BLU] ) >> 8;
+				for (j = 3; j--; ) {
+					cmon[j] = sli + pf*cmon[j];
+					if (cmon[j] <= 0) cmon[j] = 0;
+					else cmon[j] >>= 8;
+				}
 			}
 		} else if (tms->flags & TM_F_BW) {
 			cmon[RED] = cmon[GRN] = cmon[BLU] = li;
+		} else {
+			for (j = 3; j--; )
+				if (cmon[j] < 0) cmon[j] = 0;
 		}
-		bi = ( (int32)GAMTSZ*cd->clfb[RED]*cmon[RED]/li ) >> 8;
+		bi = ( (uint32)GAMTSZ*cd->clfb[RED]*cmon[RED]/li ) >> 12;
 		cs[3*i  ] = bi>=GAMTSZ ? 255 : cd->gamb[bi];
-		bi = ( (int32)GAMTSZ*cd->clfb[GRN]*cmon[GRN]/li ) >> 8;
+		bi = ( (uint32)GAMTSZ*cd->clfb[GRN]*cmon[GRN]/li ) >> 12;
 		cs[3*i+1] = bi>=GAMTSZ ? 255 : cd->gamb[bi];
-		bi = ( (int32)GAMTSZ*cd->clfb[BLU]*cmon[BLU]/li ) >> 8;
+		bi = ( (uint32)GAMTSZ*cd->clfb[BLU]*cmon[BLU]/li ) >> 12;
 		cs[3*i+2] = bi>=GAMTSZ ? 255 : cd->gamb[bi];
 	}
 	returnOK;
@@ -144,12 +147,12 @@ static struct radhead {
 
 static int
 headline(			/* grok a header line */
-	register char	*s,
+	char	*s,
 	void	*vrh
 )
 {
 	char	fmt[32];
-	register struct radhead	*rh = vrh;
+	struct radhead	*rh = vrh;
 
 	if (formatval(fmt, s)) {
 		if (!strcmp(fmt, COLRFMT))
@@ -177,7 +180,7 @@ int
 tmLoadPicture(				/* convert Radiance picture */
 TMstruct	*tms,
 TMbright	**lpp,
-BYTE	**cpp,
+uby8	**cpp,
 int	*xp,
 int	*yp,
 char	*fname,
@@ -197,7 +200,7 @@ FILE	*fp
 			((fname == NULL) & (fp == TM_GETFILE)))
 		returnErr(TM_E_ILLEGAL);
 	*xp = *yp = 0;				/* error precaution */
-	if ((inpf = fp) == TM_GETFILE && (inpf = fopen(fname, "r")) == NULL)
+	if ((inpf = fp) == TM_GETFILE && (inpf = fopen(fname, "rb")) == NULL)
 		returnErr(TM_E_BADFILE);
 	*lpp = NULL;
 	if (cpp != TM_NOCHROMP) *cpp = NULL;
@@ -221,7 +224,7 @@ FILE	*fp
 	if (*lpp == NULL)
 		goto done;
 	if (cpp != TM_NOCHROMP) {
-		*cpp = (BYTE *)malloc(3*sizeof(BYTE) * *xp * *yp);
+		*cpp = (uby8 *)malloc(3*sizeof(uby8) * *xp * *yp);
 		if (*cpp == NULL)
 			goto done;
 	}
@@ -258,7 +261,7 @@ done:						/* clean up */
 #ifdef PCOND
 static int					/* run pcond to map picture */
 dopcond(psp, xp, yp, flags, monpri, gamval, Lddyn, Ldmax, fname)
-BYTE	**psp;
+uby8	**psp;
 int	*xp, *yp;
 int	flags;
 RGBPRIMP	monpri;
@@ -269,10 +272,10 @@ char	*fname;
 	TMstruct	*tms = NULL;
 	char	cmdbuf[1024];
 	FILE	*infp;
-	register COLR	*scan;
-	register BYTE	*rp;
+	COLR	*scan;
+	uby8	*rp;
 	int	y;
-	register int	x;
+	int	x;
 					/* set up gamma correction */
 	if (setcolrcor(pow, 1./gamval) < 0)
 		returnErr(TM_E_NOMEM);
@@ -309,9 +312,9 @@ char	*fname;
 					/* allocate arrays */
 	scan = (COLR *)malloc(sizeof(COLR) * *xp);
 	if (flags & TM_F_BW)
-		rp = (BYTE *)malloc(sizeof(BYTE) * *xp * *yp);
+		rp = (uby8 *)malloc(sizeof(uby8) * *xp * *yp);
 	else
-		rp = (BYTE *)malloc(3*sizeof(BYTE) * *xp * *yp);
+		rp = (uby8 *)malloc(3*sizeof(uby8) * *xp * *yp);
 	if (((*psp = rp) == NULL) | (scan == NULL)) {
 		pclose(infp);
 		returnErr(TM_E_NOMEM);
@@ -345,7 +348,7 @@ char	*fname;
 
 int					/* map a Radiance picture */
 tmMapPicture(psp, xp, yp, flags, monpri, gamval, Lddyn, Ldmax, fname, fp)
-BYTE	**psp;
+uby8	**psp;
 int	*xp, *yp;
 int	flags;
 RGBPRIMP	monpri;
@@ -354,8 +357,8 @@ char	*fname;
 FILE	*fp;
 {
 	char	*funcName = fname==NULL ? "tmMapPicture" : fname;
-	TMstruct	*tms;
-	BYTE	*cp;
+	TMstruct	*tms = NULL;
+	uby8	*cp;
 	TMbright	*lp;
 	int	err;
 						/* check arguments */
@@ -385,7 +388,7 @@ FILE	*fp;
 	}
 						/* allocate space for result */
 	if (flags & TM_F_BW) {
-		*psp = (BYTE *)malloc(sizeof(BYTE) * *xp * *yp);
+		*psp = (uby8 *)malloc(sizeof(uby8) * *xp * *yp);
 		if (*psp == NULL) {
 			free((MEM_PTR)lp);
 			tmDone(tms);
@@ -418,27 +421,30 @@ done:						/* clean up */
 
 static void
 colrNewSpace(tms)		/* color space changed for tone mapping */
-register TMstruct	*tms;
+TMstruct	*tms;
 {
-	register COLRDATA	*cd;
+	COLRDATA	*cd;
 	double	d;
+	int	i, j;
 
 	cd = (COLRDATA *)tms->pd[colrReg];
-	cd->clfb[RED] = 256.*tms->clf[RED] + .5;
-	cd->clfb[GRN] = 256.*tms->clf[GRN] + .5;
-	cd->clfb[BLU] = 256.*tms->clf[BLU] + .5;
-	cd->clfb[EXP] = COLXS;
-	d = TM_BRTSCALE*log(tms->inpsf);
-	cd->inpsfb = d<0. ? d-.5 : d+.5;
+	for (i = 3; i--; )
+		cd->clfb[i] = 0x1000*tms->clf[i] + .5;
+	cd->inpsfb = tmCvLuminance(tms->inpsf);
+	for (i = 3; i--; )
+		for (j = 3; j--; ) {
+			d = tms->cmat[i][j] / tms->inpsf;
+			cd->cmatb[i][j] = 0x10000*d + (d<0. ? -.5 : .5);
+		}
 }
 
 
 static MEM_PTR
 colrInit(tms)			/* initialize private data for tone mapping */
-register TMstruct	*tms;
+TMstruct	*tms;
 {
-	register COLRDATA	*cd;
-	register int	i;
+	COLRDATA	*cd;
+	int	i;
 					/* allocate our data */
 	cd = (COLRDATA *)malloc(sizeof(COLRDATA));
 	if (cd == NULL)