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

Comparing ray/src/common/tmprivat.h (file contents):
Revision 3.2 by greg, Wed Apr 16 20:28:09 1997 UTC vs.
Revision 3.4 by greg, Fri Apr 18 13:59:51 1997 UTC

# Line 8 | Line 8
8  
9   #undef  NOPROTO
10   #define NOPROTO         1
11 + #ifndef MEM_PTR
12 + #define MEM_PTR         char *
13 + #endif
14   #include        "tonemap.h"
15  
16                                  /* required constants */
# Line 25 | Line 28
28   #define MINLDMAX        1.
29   #define DEFLDMAX        100.
30  
28                                /* private flags */
29 #define TM_F_INITED     010000          /* initialized flag */
30 #define TM_F_NEEDMAT    020000          /* need matrix conversion */
31
31   #define BRT2SCALE       ((int)(M_LN2*TM_BRTSCALE+.5))
32  
33   #define HISTEP          8               /* steps in BRTSCALE for each bin */
# Line 37 | Line 36
36   #define MINLUM          (1.125352e-7)           /* tmLuminance(MINBRT) */
37  
38   #define LMESLOWER       (5.62e-3)               /* lower mesopic limit */
40 #define BMESLOWER       (-663)                  /* encoded LMESLOWER */
39   #define LMESUPPER       (5.62)                  /* upper mesopic limit */
40 + #if     (TM_BRTSCALE==128)
41 + #define BMESLOWER       (-663)                  /* encoded LMESLOWER */
42   #define BMESUPPER       (221)                   /* encoded LMESUPPER */
43 + #else
44 + #define BMESLOWER       ((int)(-5.18*TM_BRTSCALE-.5))
45 + #define BMESUPPER       ((int)(1.73*TM_BRTSCALE+.5))
46 + #endif
47  
48   #ifndef int4
49   #define int4            int                     /* assume 32-bit integers */
# Line 54 | Line 58
58                                  (int4)(SCO_bf*256.+.5)*(c)[BLU] ) >> 8 )
59  
60   #ifndef malloc
61 < extern char     *malloc(), *calloc();
61 > MEM_PTR         malloc();
62 > MEM_PTR         calloc();
63   #endif
64   extern int      tmErrorReturn();
65  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines