--- ray/src/common/tmprivat.h	1997/04/16 20:28:09	3.2
+++ ray/src/common/tmprivat.h	2003/07/14 04:56:54	3.11
@@ -1,13 +1,17 @@
-/* Copyright (c) 1997 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: tmprivat.h,v 3.11 2003/07/14 04:56:54 greg Exp $ */
 /*
  * Private header file for tone mapping routines.
  */
+#ifndef _RAD_TMPRIVAT_H_
+#define _RAD_TMPRIVAT_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#undef	NOPROTO
-#define	NOPROTO		1
+#ifndef	MEM_PTR
+#define	MEM_PTR		void *
+#endif
+#include	"color.h"
 #include	"tonemap.h"
 
 				/* required constants */
@@ -25,45 +29,55 @@
 #define	MINLDMAX	1.
 #define	DEFLDMAX	100.
 
-				/* private flags */
-#define	TM_F_INITED	010000		/* initialized flag */
-#define	TM_F_NEEDMAT	020000		/* need matrix conversion */
+#define BRT2SCALE(l2)	(int)(M_LN2*TM_BRTSCALE*(l2) + ((l2)>0 ? .5 : -.5))
 
-#define BRT2SCALE	((int)(M_LN2*TM_BRTSCALE+.5))
-
 #define HISTEP		8		/* steps in BRTSCALE for each bin */
 
 #define MINBRT		(-16*TM_BRTSCALE)	/* minimum usable brightness */
 #define MINLUM		(1.125352e-7)		/* tmLuminance(MINBRT) */
 
 #define LMESLOWER	(5.62e-3)		/* lower mesopic limit */
-#define BMESLOWER	(-663)			/* encoded LMESLOWER */
 #define	LMESUPPER	(5.62)			/* upper mesopic limit */
+#if	(TM_BRTSCALE==128)
+#define BMESLOWER	(-663)			/* encoded LMESLOWER */
 #define BMESUPPER	(221)			/* encoded LMESUPPER */
-
-#ifndef	int4
-#define	int4		int			/* assume 32-bit integers */
+#else
+#define BMESLOWER	((int)(-5.18*TM_BRTSCALE-.5))
+#define BMESUPPER	((int)(1.73*TM_BRTSCALE+.5))
 #endif
 						/* approximate scotopic lum. */
 #define	SCO_rf		0.062
 #define SCO_gf		0.608
 #define SCO_bf		0.330
 #define scotlum(c)	(SCO_rf*(c)[RED] + SCO_gf*(c)[GRN] + SCO_bf*(c)[BLU])
-#define normscot(c)	( (	(int4)(SCO_rf*256.+.5)*(c)[RED] + \
-				(int4)(SCO_gf*256.+.5)*(c)[GRN] + \
-				(int4)(SCO_bf*256.+.5)*(c)[BLU]	) >> 8 )
+#define normscot(c)	( (	(int32)(SCO_rf*256.+.5)*(c)[RED] + \
+				(int32)(SCO_gf*256.+.5)*(c)[GRN] + \
+				(int32)(SCO_bf*256.+.5)*(c)[BLU]	) >> 8 )
 
 #ifndef	malloc
-extern char	*malloc(), *calloc();
+MEM_PTR		malloc();
+MEM_PTR		calloc();
 #endif
 extern int	tmErrorReturn();
 
+						/* lookup for mesopic scaling */
+extern BYTE	tmMesofact[BMESUPPER-BMESLOWER];
+
+extern void	tmMkMesofact();			/* build tmMesofact */
+
 #define	returnErr(code)	return(tmErrorReturn(funcName,code))
 #define returnOK	return(TM_E_OK)
 
 #define	FEQ(a,b)	((a) < (b)+1e-5 && (b) < (a)+1e-5)
 
-#define	PRIMEQ(p1,p2)	(FEQ((p1)[0][0],(p2)[0][0])&&FEQ((p1)[0][1],(p2)[0][2])\
-			&&FEQ((p1)[1][0],(p2)[1][0])&&FEQ((p1)[1][1],(p2)[1][2])\
-			&&FEQ((p1)[2][0],(p2)[2][0])&&FEQ((p1)[2][1],(p2)[2][2])\
-			&&FEQ((p1)[3][0],(p2)[3][0])&&FEQ((p1)[3][1],(p2)[3][2]))
+#define	PRIMEQ(p1,p2)	(FEQ((p1)[0][0],(p2)[0][0])&&FEQ((p1)[0][1],(p2)[0][1])\
+			&&FEQ((p1)[1][0],(p2)[1][0])&&FEQ((p1)[1][1],(p2)[1][1])\
+			&&FEQ((p1)[2][0],(p2)[2][0])&&FEQ((p1)[2][1],(p2)[2][1])\
+			&&FEQ((p1)[3][0],(p2)[3][0])&&FEQ((p1)[3][1],(p2)[3][1]))
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_TMPRIVAT_H_ */
+