ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/common/tmprivat.h
(Generate patch)

Comparing ray/src/common/tmprivat.h (file contents):
Revision 3.8 by schorsch, Fri Jun 6 16:38:47 2003 UTC vs.
Revision 3.10 by greg, Fri Jun 27 06:53:22 2003 UTC

# Line 8 | Line 8
8   extern "C" {
9   #endif
10  
11 – #include "copyright.h"
12 –
11   #ifndef MEM_PTR
12   #define MEM_PTR         void *
13   #endif
14   #include        "color.h"
15   #include        "tonemap.h"
16 + #include        "tifftypes.h"
17  
18                                  /* required constants */
19   #ifndef M_LN2
# Line 47 | Line 46 | extern "C" {
46   #define BMESLOWER       ((int)(-5.18*TM_BRTSCALE-.5))
47   #define BMESUPPER       ((int)(1.73*TM_BRTSCALE+.5))
48   #endif
50 –
51 – #ifndef int4
52 – #define int4            int                     /* assume 32-bit integers */
53 – #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();

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)