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.12 by schorsch, Mon Jul 14 22:23:59 2003 UTC vs.
Revision 3.19 by greg, Mon Feb 9 20:48:08 2009 UTC

# Line 37 | Line 37 | extern "C" {
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 */
45   #if     (TM_BRTSCALE==128)
# Line 55 | Line 58 | extern "C" {
58                                  (int32)(SCO_gf*256.+.5)*(c)[GRN] + \
59                                  (int32)(SCO_bf*256.+.5)*(c)[BLU]        ) >> 8 )
60  
61 < #ifndef malloc
59 < MEM_PTR         malloc();
60 < MEM_PTR         calloc();
61 < #endif
62 < extern int      tmErrorReturn();
61 > extern int      tmNewMap(TMstruct *tms);        /* allocate new tone-mapping */
62  
63 + extern int      tmErrorReturn(const char *, TMstruct *, int);
64 +
65                                                  /* lookup for mesopic scaling */
66   extern BYTE     tmMesofact[BMESUPPER-BMESLOWER];
67  
68 < extern void     tmMkMesofact();                 /* build tmMesofact */
68 > extern void     tmMkMesofact(void);                     /* build tmMesofact */
69  
70 < #define returnErr(code) return(tmErrorReturn(funcName,code))
70 > #define returnErr(code) return(tmErrorReturn(funcName,tms,code))
71   #define returnOK        return(TM_E_OK)
72  
73   #define FEQ(a,b)        ((a) < (b)+1e-5 && (b) < (a)+1e-5)
# Line 75 | Line 76 | extern void    tmMkMesofact();                 /* build tmMesofact */
76                          &&FEQ((p1)[1][0],(p2)[1][0])&&FEQ((p1)[1][1],(p2)[1][1])\
77                          &&FEQ((p1)[2][0],(p2)[2][0])&&FEQ((p1)[2][1],(p2)[2][1])\
78                          &&FEQ((p1)[3][0],(p2)[3][0])&&FEQ((p1)[3][1],(p2)[3][1]))
78
79  
80   #ifdef __cplusplus
81   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines