--- ray/src/common/tmprivat.h	1997/04/17 19:09:33	3.3
+++ ray/src/common/tmprivat.h	2003/02/25 02:47:22	3.7
@@ -1,15 +1,20 @@
-/* Copyright (c) 1997 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: tmprivat.h,v 3.7 2003/02/25 02:47:22 greg Exp $ */
 /*
  * Private header file for tone mapping routines.
  */
 
-#undef	NOPROTO
-#define	NOPROTO		1
+#include "copyright.h"
+
+#ifndef	MEM_PTR
+#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
@@ -25,12 +30,8 @@
 #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 */
@@ -59,16 +60,26 @@
 				(int4)(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