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.14 by greg, Fri Jan 7 20:33:02 2005 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 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();
60   MEM_PTR         calloc();
61   #endif
62 < extern int      tmErrorReturn();
62 > extern int      tmErrorReturn(char *, TMstruct *, int);
63  
64                                                  /* lookup for mesopic scaling */
65   extern BYTE     tmMesofact[BMESUPPER-BMESLOWER];
66  
67 < extern void     tmMkMesofact();                 /* build tmMesofact */
67 > extern void     tmMkMesofact(void);                     /* build tmMesofact */
68  
69 < #define returnErr(code) return(tmErrorReturn(funcName,code))
69 > #define returnErr(code) return(tmErrorReturn(funcName,tms,code))
70   #define returnOK        return(TM_E_OK)
71  
72   #define FEQ(a,b)        ((a) < (b)+1e-5 && (b) < (a)+1e-5)
# Line 83 | Line 79 | extern void    tmMkMesofact();                 /* build tmMesofact */
79   #ifdef __cplusplus
80   }
81   #endif
82 + #endif /* _RAD_TMPRIVAT_H_ */
83 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines