ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/common/tmprivat.h
(Generate patch)

Comparing ray/src/common/tmprivat.h (file contents):
Revision 3.18 by greg, Mon Feb 9 20:23:51 2009 UTC vs.
Revision 3.20 by greg, Tue Jul 27 16:13:40 2010 UTC

# 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))
51 – #endif
47                                                  /* approximate scotopic lum. */
48   #define SCO_rf          0.062
49   #define SCO_gf          0.608
# Line 60 | Line 55 | extern "C" {
55  
56   extern int      tmNewMap(TMstruct *tms);        /* allocate new tone-mapping */
57  
63 – #ifndef malloc
64 – MEM_PTR         malloc();
65 – MEM_PTR         calloc();
66 – #endif
58   extern int      tmErrorReturn(const char *, TMstruct *, int);
59  
60                                                  /* lookup for mesopic scaling */

Diff Legend

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