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.10 by greg, Fri Jun 27 06:53:22 2003 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 + #ifdef __cplusplus
8 + extern "C" {
9 + #endif
10  
6 #include "copyright.h"
7
11   #ifndef MEM_PTR
12   #define MEM_PTR         void *
13   #endif
14   #include        "color.h"
15   #include        "tonemap.h"
16 + #include        "tifftypes.h"
17  
14 #ifdef __cplusplus
15 extern "C" {
16 #endif
17
18                                  /* required constants */
19   #ifndef M_LN2
20   #define M_LN2           0.69314718055994530942
# Line 46 | Line 46 | extern "C" {
46   #define BMESLOWER       ((int)(-5.18*TM_BRTSCALE-.5))
47   #define BMESUPPER       ((int)(1.73*TM_BRTSCALE+.5))
48   #endif
49
50 #ifndef int4
51 #define int4            int                     /* assume 32-bit integers */
52 #endif
49                                                  /* approximate scotopic lum. */
50   #define SCO_rf          0.062
51   #define SCO_gf          0.608
52   #define SCO_bf          0.330
53   #define scotlum(c)      (SCO_rf*(c)[RED] + SCO_gf*(c)[GRN] + SCO_bf*(c)[BLU])
54 < #define normscot(c)     ( (     (int4)(SCO_rf*256.+.5)*(c)[RED] + \
55 <                                (int4)(SCO_gf*256.+.5)*(c)[GRN] + \
56 <                                (int4)(SCO_bf*256.+.5)*(c)[BLU] ) >> 8 )
54 > #define normscot(c)     ( (     (int32)(SCO_rf*256.+.5)*(c)[RED] + \
55 >                                (int32)(SCO_gf*256.+.5)*(c)[GRN] + \
56 >                                (int32)(SCO_bf*256.+.5)*(c)[BLU]        ) >> 8 )
57  
58   #ifndef malloc
59   MEM_PTR         malloc();
# Line 80 | Line 76 | extern void    tmMkMesofact();                 /* build tmMesofact */
76                          &&FEQ((p1)[2][0],(p2)[2][0])&&FEQ((p1)[2][1],(p2)[2][1])\
77                          &&FEQ((p1)[3][0],(p2)[3][0])&&FEQ((p1)[3][1],(p2)[3][1]))
78  
79 +
80   #ifdef __cplusplus
81   }
82   #endif
83 + #endif /* _RAD_TMPRIVAT_H_ */
84 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines