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.13 by schorsch, Thu Jul 17 09:21:29 2003 UTC vs.
Revision 3.26 by greg, Sat Jan 15 16:57:46 2022 UTC

# Line 5 | Line 5
5   #ifndef _RAD_TMPRIVAT_H_
6   #define _RAD_TMPRIVAT_H_
7  
8 #ifndef MEM_PTR
9 #define MEM_PTR         void *
10 #endif
8   #include        "color.h"
9   #include        "tonemap.h"
10  
# Line 26 | Line 23 | extern "C" {
23   #define MINGAM          0.75
24   #define DEFGAM          2.2
25   #define MINLDDYN        2.
26 < #define DEFLDDYN        32.
26 > #define DEFLDDYN        100.
27   #define MINLDMAX        1.
28   #define DEFLDMAX        100.
29  
30 < #define BRT2SCALE(l2)   (int)(M_LN2*TM_BRTSCALE*(l2) + ((l2)>0 ? .5 : -.5))
30 > #define BRT2SCALE(l2)   (int)(M_LN2*TM_BRTSCALE*(l2) + .5 - ((l2) < 0))
31  
32 < #define HISTEP          8               /* steps in BRTSCALE for each bin */
32 > #define HISTEP          16              /* steps in BRTSCALE for each bin */
33  
34   #define MINBRT          (-16*TM_BRTSCALE)       /* minimum usable brightness */
35   #define MINLUM          (1.125352e-7)           /* tmLuminance(MINBRT) */
36  
37 + #define HISTI(li)       (((li)-MINBRT)/HISTEP)
38 + #define HISTV(i)        (MINBRT + HISTEP/2 + (i)*HISTEP)
39 +
40   #define LMESLOWER       (5.62e-3)               /* lower mesopic limit */
41   #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
42   #define BMESLOWER       ((int)(-5.18*TM_BRTSCALE-.5))
43   #define BMESUPPER       ((int)(1.73*TM_BRTSCALE+.5))
44 < #endif
44 >
45                                                  /* approximate scotopic lum. */
46   #define SCO_rf          0.062
47   #define SCO_gf          0.608
# Line 55 | Line 51 | extern "C" {
51                                  (int32)(SCO_gf*256.+.5)*(c)[GRN] + \
52                                  (int32)(SCO_bf*256.+.5)*(c)[BLU]        ) >> 8 )
53  
54 < #ifndef malloc
59 < MEM_PTR         malloc();
60 < MEM_PTR         calloc();
61 < #endif
62 < extern int      tmErrorReturn(char*, int);
54 > extern int      tmNewMap(TMstruct *tms);        /* allocate new tone-mapping */
55  
56 + extern int      tmErrorReturn(const char *, TMstruct *, int);
57 +
58                                                  /* lookup for mesopic scaling */
59 < extern BYTE     tmMesofact[BMESUPPER-BMESLOWER];
59 > extern uby8     tmMesofact[BMESUPPER-BMESLOWER];
60  
61   extern void     tmMkMesofact(void);                     /* build tmMesofact */
62  
63 < #define returnErr(code) return(tmErrorReturn(funcName,code))
63 > #define returnErr(code) return(tmErrorReturn(funcName,tms,code))
64   #define returnOK        return(TM_E_OK)
65  
66   #define FEQ(a,b)        ((a) < (b)+1e-5 && (b) < (a)+1e-5)
# Line 75 | Line 69 | extern void    tmMkMesofact(void);                     /* build tmMesofact
69                          &&FEQ((p1)[1][0],(p2)[1][0])&&FEQ((p1)[1][1],(p2)[1][1])\
70                          &&FEQ((p1)[2][0],(p2)[2][0])&&FEQ((p1)[2][1],(p2)[2][1])\
71                          &&FEQ((p1)[3][0],(p2)[3][0])&&FEQ((p1)[3][1],(p2)[3][1]))
78
72  
73   #ifdef __cplusplus
74   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines