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.14 by greg, Fri Jan 7 20:33:02 2005 UTC vs.
Revision 3.24 by greg, Fri May 20 02:06:38 2011 UTC

# Line 30 | Line 30 | extern "C" {
30   #define MINLDMAX        1.
31   #define DEFLDMAX        100.
32  
33 < #define BRT2SCALE(l2)   (int)(M_LN2*TM_BRTSCALE*(l2) + ((l2)>0 ? .5 : -.5))
33 > #define BRT2SCALE(l2)   (int)(M_LN2*TM_BRTSCALE*(l2) + .5 - ((l2) < 0))
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) */
39  
40 + #define HISTI(li)       (((li)-MINBRT)/HISTEP)
41 + #define HISTV(i)        (MINBRT + HISTEP/2 + (i)*HISTEP)
42 +
43   #define LMESLOWER       (5.62e-3)               /* lower mesopic limit */
44   #define LMESUPPER       (5.62)                  /* upper mesopic limit */
42 #if     (TM_BRTSCALE==128)
43 #define BMESLOWER       (-663)                  /* encoded LMESLOWER */
44 #define BMESUPPER       (221)                   /* encoded LMESUPPER */
45 #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
# Line 55 | Line 54 | extern "C" {
54                                  (int32)(SCO_gf*256.+.5)*(c)[GRN] + \
55                                  (int32)(SCO_bf*256.+.5)*(c)[BLU]        ) >> 8 )
56  
57 < #ifndef malloc
59 < MEM_PTR         malloc();
60 < MEM_PTR         calloc();
61 < #endif
62 < extern int      tmErrorReturn(char *, TMstruct *, int);
57 > extern int      tmNewMap(TMstruct *tms);        /* allocate new tone-mapping */
58  
59 + extern int      tmErrorReturn(const char *, TMstruct *, int);
60 +
61                                                  /* lookup for mesopic scaling */
62 < extern BYTE     tmMesofact[BMESUPPER-BMESLOWER];
62 > extern uby8     tmMesofact[BMESUPPER-BMESLOWER];
63  
64   extern void     tmMkMesofact(void);                     /* build tmMesofact */
65  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines