--- ray/src/common/tmprivat.h	1997/04/18 13:59:51	3.4
+++ ray/src/common/tmprivat.h	2005/01/07 21:41:06	3.15
@@ -1,18 +1,20 @@
-/* Copyright (c) 1997 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: tmprivat.h,v 3.15 2005/01/07 21:41:06 greg Exp $ */
 /*
  * Private header file for tone mapping routines.
  */
+#ifndef _RAD_TMPRIVAT_H_
+#define _RAD_TMPRIVAT_H_
 
-#undef	NOPROTO
-#define	NOPROTO		1
 #ifndef	MEM_PTR
-#define	MEM_PTR		char *
+#define	MEM_PTR		void *
 #endif
+#include	"color.h"
 #include	"tonemap.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 				/* required constants */
 #ifndef M_LN2
 #define M_LN2		0.69314718055994530942
@@ -28,7 +30,7 @@
 #define	MINLDMAX	1.
 #define	DEFLDMAX	100.
 
-#define BRT2SCALE	((int)(M_LN2*TM_BRTSCALE+.5))
+#define BRT2SCALE(l2)	(int)(M_LN2*TM_BRTSCALE*(l2) + ((l2)>0 ? .5 : -.5))
 
 #define HISTEP		8		/* steps in BRTSCALE for each bin */
 
@@ -44,31 +46,38 @@
 #define BMESLOWER	((int)(-5.18*TM_BRTSCALE-.5))
 #define BMESUPPER	((int)(1.73*TM_BRTSCALE+.5))
 #endif
-
-#ifndef	int4
-#define	int4		int			/* assume 32-bit integers */
-#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
 MEM_PTR		malloc();
 MEM_PTR		calloc();
 #endif
-extern int	tmErrorReturn();
+extern int	tmErrorReturn(const char *, TMstruct *, int);
 
-#define	returnErr(code)	return(tmErrorReturn(funcName,code))
+						/* lookup for mesopic scaling */
+extern BYTE	tmMesofact[BMESUPPER-BMESLOWER];
+
+extern void	tmMkMesofact(void);			/* build tmMesofact */
+
+#define	returnErr(code)	return(tmErrorReturn(funcName,tms,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_ */
+