ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/tmprivat.h

Comparing ray/src/common/tmprivat.h (file contents):
Revision 3.19 by greg, Mon Feb 9 20:48:08 2009 UTC vs.
Revision 3.22 by greg, Wed Aug 18 15:25:03 2010 UTC

#	Line 32 | Line 32 | extern "C" {
32
33		#define BRT2SCALE(l2)   (int)(M_LN2*TM_BRTSCALE*(l2) + ((l2)>0 ? .5 : -.5))
34
35	<	#define HISTEP          8               /* steps in BRTSCALE for each bin */
35	>	#define HISTEP          16              /* steps in BRTSCALE for each bin */
36
37		#define MINBRT          (-16*TM_BRTSCALE)       /* minimum usable brightness */
38		#define MINLUM          (1.125352e-7)           /* tmLuminance(MINBRT) */
#	Line 42 | Line 42 | extern "C" {
42
43		#define LMESLOWER       (5.62e-3)               /* lower mesopic limit */
44		#define LMESUPPER       (5.62)                  /* upper mesopic limit */
45	–	#if     (TM_BRTSCALE==128)
46	–	#define BMESLOWER       (-663)                  /* encoded LMESLOWER */
47	–	#define BMESUPPER       (221)                   /* encoded LMESUPPER */
48	–	#else
45		#define BMESLOWER       ((int)(-5.18*TM_BRTSCALE-.5))
46		#define BMESUPPER       ((int)(1.73*TM_BRTSCALE+.5))
47	<	#endif
47	>
48		/* approximate scotopic lum. */
49		#define SCO_rf          0.062
50		#define SCO_gf          0.608

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)