--- ray/src/common/tmprivat.h	1997/04/15 16:53:05	3.1
+++ ray/src/common/tmprivat.h	1998/08/17 17:58:46	3.5
@@ -1,6 +1,6 @@
-/* Copyright (c) 1997 Regents of the University of California */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
-/* SCCSid "$SunId$ LBL" */
+/* SCCSid "$SunId$ SGI" */
 
 /*
  * Private header file for tone mapping routines.
@@ -8,7 +8,19 @@
 
 #undef	NOPROTO
 #define	NOPROTO		1
+#ifndef	MEM_PTR
+#define	MEM_PTR		char *
+#endif
+#include	"color.h"
 #include	"tonemap.h"
+
+				/* required constants */
+#ifndef M_LN2
+#define M_LN2		0.69314718055994530942
+#endif
+#ifndef M_LN10
+#define M_LN10		2.30258509299404568402
+#endif
 				/* minimum values and defaults */
 #define	MINGAM		0.75
 #define DEFGAM		2.2
@@ -17,10 +29,6 @@
 #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	((int)(M_LN2*TM_BRTSCALE+.5))
 
 #define HISTEP		8		/* steps in BRTSCALE for each bin */
@@ -29,9 +37,14 @@
 #define MINLUM		(1.125352e-7)		/* tmLuminance(MINBRT) */
 
 #define LMESLOWER	(5.62e-3)		/* lower mesopic limit */
-#define BMESLOWER	((int)(-5.18*TM_BRTSCALE-.5))
 #define	LMESUPPER	(5.62)			/* upper mesopic limit */
+#if	(TM_BRTSCALE==128)
+#define BMESLOWER	(-663)			/* encoded LMESLOWER */
+#define BMESUPPER	(221)			/* encoded LMESUPPER */
+#else
+#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 */
@@ -46,7 +59,8 @@
 				(int4)(SCO_bf*256.+.5)*(c)[BLU]	) >> 8 )
 
 #ifndef	malloc
-extern char	*malloc(), *calloc();
+MEM_PTR		malloc();
+MEM_PTR		calloc();
 #endif
 extern int	tmErrorReturn();