--- ray/src/common/tmapluv.c	1998/12/20 16:38:29	3.3
+++ ray/src/common/tmapluv.c	2003/02/22 02:07:22	3.4
@@ -1,18 +1,77 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: tmapluv.c,v 3.4 2003/02/22 02:07:22 greg Exp $";
 #endif
-
 /*
  * Routines for tone-mapping LogLuv encoded pixels.
+ *
+ * Externals declared in tmaptiff.h
  */
 
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
+ *
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *         notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
+ */
+
+#define LOGLUV_PUBLIC		1
+
 #include <stdio.h>
+#include <string.h>
 #include <math.h>
 #include "tiffio.h"
 #include "tmprivat.h"
-#include "uvcode.h"
+#include "tmaptiff.h"
 
 #ifndef BSD
 #define bzero(d,n)		(void)memset(d,0,n)
@@ -23,14 +82,17 @@ static char SCCSid[] = "$SunId$ SGI";
 #define clruv(p,uv)		uvflgop(p,uv,&=~)
 #define clruvall(p)		bzero((MEM_PTR)(p)->rgbflg,sizeof((p)->rgbflg))
 
-#define U_NEU			0.210526316
-#define V_NEU			0.473684211
-
+#ifdef NOPROTO
 static MEM_PTR	luv32Init();
 static void	luv32NewSpace();
 static MEM_PTR	luv24Init();
 static void	luv24NewSpace();
-extern void	free();
+#else
+static MEM_PTR	luv32Init(struct tmStruct *);
+static void	luv32NewSpace(struct tmStruct *);
+static MEM_PTR	luv24Init(struct tmStruct *);
+static void	luv24NewSpace(struct tmStruct *);
+#endif
 
 typedef struct {
 	int	offset;			/* computed luminance offset */
@@ -38,7 +100,6 @@ typedef struct {
 	uint32	rgbflg[1<<(16-5)];	/* flags for computed values */
 } LUV32DATA;			/* LogLuv 32-bit conversion data */
 
-#define UVSCALE			410.
 #define UVNEU			((int)(UVSCALE*U_NEU)<<8 \
 					| (int)(UVSCALE*V_NEU))
 
@@ -61,7 +122,7 @@ static int	luv24Reg = -1;		/* 24-bit package reg. numb
 static int	uv14neu = -1;		/* neutral index for 14-bit (u',v') */
 
 
-static
+static void
 uv2rgb(rgb, tm, uvp)			/* compute RGB from uv coordinate */
 BYTE	rgb[3];
 register struct tmStruct	*tm;
@@ -78,7 +139,7 @@ double	uvp[2];
 	XYZ[CIEZ] = (1.-x-y)/y * XYZ[CIEY];
 					/* convert to RGB and clip */
 	colortrans(RGB, tm->cmat, XYZ);
-	clipgamut(RGB, XYZ[CIEY], CGAMUT_LOWER, cblack, cwhite);
+	clipgamut(RGB, 1., CGAMUT_LOWER, cblack, cwhite);
 					/* perform final scaling & gamma */
 	d = tm->clf[RED] * RGB[RED];
 	rgb[RED] = d>=.999 ? 255 : (int)(256.*pow(d, 1./tm->mongam));
@@ -94,74 +155,31 @@ compmeshift(li, uvp)			/* compute mesopic color shift 
 TMbright	li;		/* encoded world luminance */
 double	uvp[2];			/* world (u',v') -> returned desaturated */
 {
-	double	scotrat, d;
+	double	scotrat;
+	register double	d;
 
 	if (li >= BMESUPPER)
 		return(li);
-	scotrat = 1.33/9.*(6.*uvp[0]-16.*uvp[1]+12.)/uvp[0] - 1.68;
+	scotrat = (.767676768 - 1.02356902*uvp[1])/uvp[0] - .343434343;
 	if (li <= BMESLOWER) {
 		d = 0.;
 		uvp[0] = U_NEU; uvp[1] = V_NEU;
 	} else {
-		d = (tmLuminance(li) - LMESLOWER)/(LMESUPPER - LMESLOWER);
+		d = (tmMesofact[li-BMESLOWER] + .5) * (1./256.);
 		uvp[0] = d*uvp[0] + (1.-d)*U_NEU;
 		uvp[1] = d*uvp[1] + (1.-d)*V_NEU;
 	}
-	d = li + (double)TM_BRTSCALE*log(d + (1.-d)*scotrat/2.26);
-	return((TMbright)(d+.5));
+	/*
+	d = li + (double)TM_BRTSCALE*log(d + (1.-d)*scotrat);
+	*/
+	d = d + (1.-d)*scotrat;
+	d -= 1.;			/* Taylor expansion of log(x) about 1 */
+	d = d*(1. + d*(-.5 + d*(1./3. + d*-.125)));
+	d = li + (double)TM_BRTSCALE*d;
+	return((TMbright)(d>0. ? d+.5 : d-.5));
 }
 
 
-static int
-uvpencode(uvp)			/* encode (u',v') coordinates */
-double	uvp[2];
-{
-	register int	vi, ui;
-
-	if (uvp[1] < UV_VSTART)
-		return(-1);
-	vi = (uvp[1] - UV_VSTART)*(1./UV_SQSIZ);
-	if (vi >= UV_NVS)
-		return(-1);
-	if (uvp[0] < uv_row[vi].ustart)
-		return(-1);
-	ui = (uvp[0] - uv_row[vi].ustart)*(1./UV_SQSIZ);
-	if (ui >= uv_row[vi].nus)
-		return(-1);
-	return(uv_row[vi].ncum + ui);
-}
-
-
-static int
-uvpdecode(uvp, c)		/* decode (u',v') index */
-double	uvp[2];
-int	c;
-{
-	int	upper, lower;
-	register int	ui, vi;
-
-	if (c < 0 || c >= UV_NDIVS)
-		return(-1);
-	lower = 0;			/* binary search */
-	upper = UV_NVS;
-	do {
-		vi = (lower + upper) >> 1;
-		ui = c - uv_row[vi].ncum;
-		if (ui > 0)
-			lower = vi;
-		else if (ui < 0)
-			upper = vi;
-		else
-			break;
-	} while (upper - lower > 1);
-	vi = lower;
-	ui = c - uv_row[vi].ncum;
-	uvp[0] = uv_row[vi].ustart + (ui+.5)*UV_SQSIZ;
-	uvp[1] = UV_VSTART + (vi+.5)*UV_SQSIZ;
-	return(0);
-}
-
-
 int
 tmCvLuv32(ls, cs, luvs, len)		/* convert raw 32-bit LogLuv values */
 TMbright	*ls;
@@ -179,8 +197,11 @@ int	len;
 	if (ls == NULL | luvs == NULL | len < 0)
 		returnErr(TM_E_ILLEGAL);
 					/* check package registration */
-	if (luv32Reg < 0 && (luv32Reg = tmRegPkg(&luv32Pkg)) < 0)
-		returnErr(TM_E_CODERR1);
+	if (luv32Reg < 0) {
+		if ((luv32Reg = tmRegPkg(&luv32Pkg)) < 0)
+			returnErr(TM_E_CODERR1);
+		tmMkMesofact();
+	}
 					/* get package data */
 	if ((ld = (LUV32DATA *)tmPkgData(tmTop,luv32Reg)) == NULL)
 		returnErr(TM_E_NOMEM);
@@ -190,7 +211,7 @@ int	len;
 		if (j & 0x8000)			/* negative luminance */
 			ls[i] = TM_NOBRT;	/* assign bogus value */
 		else				/* else convert to lnL */
-			ls[i] = (BRT2SCALE*j >> 8) - ld->offset;
+			ls[i] = (BRT2SCALE(j) >> 8) - ld->offset;
 		if (cs == TM_NOCHROM)		/* no color? */
 			continue;
 						/* get chrominance */
@@ -206,8 +227,8 @@ int	len;
 			j = tmTop->flags&TM_F_BW ? UVNEU : luvs[i]&0xffff;
 		}
 		if (!isuvset(ld, j)) {
-			uvp[0] = 1./UVSCALE*((luvs[i]>>8 & 0xff) + .5);
-			uvp[1] = 1./UVSCALE*((luvs[i] & 0xff) + .5);
+			uvp[0] = 1./UVSCALE*((j>>8) + .5);
+			uvp[1] = 1./UVSCALE*((j & 0xff) + .5);
 			uv2rgb(ld->rgbval[j], tmTop, uvp);
 			setuv(ld, j);
 		}
@@ -236,32 +257,36 @@ int	len;
 	if (ls == NULL | luvs == NULL | len < 0)
 		returnErr(TM_E_ILLEGAL);
 					/* check package registration */
-	if (luv24Reg < 0 && (luv24Reg = tmRegPkg(&luv24Pkg)) < 0)
-		returnErr(TM_E_CODERR1);
+	if (luv24Reg < 0) {
+		if ((luv24Reg = tmRegPkg(&luv24Pkg)) < 0)
+			returnErr(TM_E_CODERR1);
+		tmMkMesofact();
+	}
 					/* get package data */
 	if ((ld = (LUV24DATA *)tmPkgData(tmTop,luv24Reg)) == NULL)
 		returnErr(TM_E_NOMEM);
 					/* convert each pixel */
 	for (i = len; i--; ) {
 		j = luvs[i] >> 14;		/* get luminance */
-		ls[i] = (BRT2SCALE*j >> 6) - ld->offset;
+		ls[i] = (BRT2SCALE(j) >> 6) - ld->offset;
 		if (cs == TM_NOCHROM)		/* no color? */
 			continue;
 						/* get chrominance */
 		if (tmTop->flags & TM_F_MESOPIC && ls[i] < BMESUPPER) {
-			if (uvpdecode(uvp, luvs[i]&0x3fff) < 0) {
+			if (uv_decode(uvp, uvp+1, luvs[i]&0x3fff) < 0) {
 				uvp[0] = U_NEU;		/* should barf? */
 				uvp[1] = V_NEU;
 			}
 			ls[i] = compmeshift(ls[i], uvp);
 			if (tmTop->flags&TM_F_BW || ls[i]<BMESLOWER
-					|| (j = uvpencode(uvp)) < 0)
+					|| (j = uv_encode(uvp[0], uvp[1],
+						SGILOGENCODE_NODITHER)) < 0)
 				j = uv14neu;
 		} else {
 			j = tmTop->flags&TM_F_BW ? uv14neu : luvs[i]&0x3fff;
 		}
 		if (!isuvset(ld, j)) {
-			if (uvpdecode(uvp, j) < 0) {
+			if (uv_decode(&uvp[0], &uvp[1], j) < 0) {
 				uvp[0] = U_NEU; uvp[1] = V_NEU;
 			}
 			uv2rgb(ld->rgbval[j], tmTop, uvp);
@@ -292,7 +317,7 @@ int	len;
 		returnErr(TM_E_ILLEGAL);
 					/* check scaling offset */
 	if (!FEQ(tmTop->inpsf, lastsf)) {
-		offset = BRT2SCALE*64;
+		offset = BRT2SCALE(64);
 		if (tmTop->inpsf > 1.0001)
 			offset -= (int)(TM_BRTSCALE*log(tmTop->inpsf)+.5);
 		else if (tmTop->inpsf < 0.9999)
@@ -304,7 +329,7 @@ int	len;
 		if (l16s[i] & 0x8000)		/* negative luminance */
 			ls[i] = TM_NOBRT;	/* assign bogus value */
 		else				/* else convert to lnL */
-			ls[i] = (BRT2SCALE*l16s[i] >> 8) - offset;
+			ls[i] = (BRT2SCALE(l16s[i]) >> 8) - offset;
 	}
 	returnOK;
 }
@@ -321,7 +346,7 @@ struct tmStruct	*tm;
 		exit(1);
 	}
 	ld = (LUV32DATA *)tm->pd[luv32Reg];
-	ld->offset = BRT2SCALE*64;
+	ld->offset = BRT2SCALE(64);
 	if (tm->inpsf > 1.0001)
 		ld->offset -= (int)(TM_BRTSCALE*log(tmTop->inpsf)+.5);
 	else if (tm->inpsf < 0.9999)
@@ -350,14 +375,13 @@ luv24NewSpace(tm)		/* initialize 24-bit LogLuv color s
 struct tmStruct	*tm;
 {
 	register LUV24DATA	*ld;
-	double	uvp[2];
 
 	if (tm->inppri != TM_XYZPRIM) {		/* panic time! */
 		fputs("Improper input color space in luv24NewSpace!\n", stderr);
 		exit(1);
 	}
 	ld = (LUV24DATA *)tm->pd[luv24Reg];
-	ld->offset = BRT2SCALE*12;
+	ld->offset = BRT2SCALE(12);
 	if (tm->inpsf > 1.0001)
 		ld->offset -= (int)(TM_BRTSCALE*log(tmTop->inpsf)+.5);
 	else if (tm->inpsf < 0.9999)
@@ -376,11 +400,8 @@ struct tmStruct	*tm;
 	if (ld == NULL)
 		return(NULL);
 	tm->pd[luv24Reg] = (MEM_PTR)ld;
-	if (uv14neu < 0) {		/* initialize neutral color index */
-		double	uvp[2];
-		uvp[0] = U_NEU; uvp[1] = V_NEU;
-		uv14neu = uvpencode(uvp);
-	}
+	if (uv14neu < 0)		/* initialize neutral color index */
+		uv14neu = uv_encode(U_NEU, V_NEU, SGILOGENCODE_NODITHER);
 	luv24NewSpace(tm);
 	return((MEM_PTR)ld);
 }