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.7 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 3.20 by greg, Tue Jul 27 16:13:40 2010 UTC

# Line 2 | Line 2
2   /*
3   * Private header file for tone mapping routines.
4   */
5 + #ifndef _RAD_TMPRIVAT_H_
6 + #define _RAD_TMPRIVAT_H_
7  
6 #include "copyright.h"
7
8   #ifndef MEM_PTR
9   #define MEM_PTR         void *
10   #endif
# 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 */
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))
48 #endif
49
50 #ifndef int4
51 #define int4            int                     /* assume 32-bit integers */
52 #endif
47                                                  /* approximate scotopic lum. */
48   #define SCO_rf          0.062
49   #define SCO_gf          0.608
50   #define SCO_bf          0.330
51   #define scotlum(c)      (SCO_rf*(c)[RED] + SCO_gf*(c)[GRN] + SCO_bf*(c)[BLU])
52 < #define normscot(c)     ( (     (int4)(SCO_rf*256.+.5)*(c)[RED] + \
53 <                                (int4)(SCO_gf*256.+.5)*(c)[GRN] + \
54 <                                (int4)(SCO_bf*256.+.5)*(c)[BLU] ) >> 8 )
52 > #define normscot(c)     ( (     (int32)(SCO_rf*256.+.5)*(c)[RED] + \
53 >                                (int32)(SCO_gf*256.+.5)*(c)[GRN] + \
54 >                                (int32)(SCO_bf*256.+.5)*(c)[BLU]        ) >> 8 )
55  
56 < #ifndef malloc
63 < MEM_PTR         malloc();
64 < MEM_PTR         calloc();
65 < #endif
66 < extern int      tmErrorReturn();
56 > extern int      tmNewMap(TMstruct *tms);        /* allocate new tone-mapping */
57  
58 + extern int      tmErrorReturn(const char *, TMstruct *, int);
59 +
60                                                  /* lookup for mesopic scaling */
61   extern BYTE     tmMesofact[BMESUPPER-BMESLOWER];
62  
63 < extern void     tmMkMesofact();                 /* build tmMesofact */
63 > extern void     tmMkMesofact(void);                     /* build tmMesofact */
64  
65 < #define returnErr(code) return(tmErrorReturn(funcName,code))
65 > #define returnErr(code) return(tmErrorReturn(funcName,tms,code))
66   #define returnOK        return(TM_E_OK)
67  
68   #define FEQ(a,b)        ((a) < (b)+1e-5 && (b) < (a)+1e-5)
# Line 83 | Line 75 | extern void    tmMkMesofact();                 /* build tmMesofact */
75   #ifdef __cplusplus
76   }
77   #endif
78 + #endif /* _RAD_TMPRIVAT_H_ */
79 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines