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.11 by greg, Mon Jul 14 04:56:54 2003 UTC vs.
Revision 3.17 by greg, Thu Jul 3 03:35:10 2008 UTC

# Line 4 | Line 4
4   */
5   #ifndef _RAD_TMPRIVAT_H_
6   #define _RAD_TMPRIVAT_H_
7 – #ifdef __cplusplus
8 – extern "C" {
9 – #endif
7  
8   #ifndef MEM_PTR
9   #define MEM_PTR         void *
# Line 14 | Line 11 | extern "C" {
11   #include        "color.h"
12   #include        "tonemap.h"
13  
14 + #ifdef __cplusplus
15 + extern "C" {
16 + #endif
17 +
18                                  /* required constants */
19   #ifndef M_LN2
20   #define M_LN2           0.69314718055994530942
# Line 36 | 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 58 | Line 62 | extern "C" {
62   MEM_PTR         malloc();
63   MEM_PTR         calloc();
64   #endif
65 < extern int      tmErrorReturn();
65 > extern int      tmErrorReturn(const char *, TMstruct *, int);
66  
67                                                  /* lookup for mesopic scaling */
68   extern BYTE     tmMesofact[BMESUPPER-BMESLOWER];
69  
70 < extern void     tmMkMesofact();                 /* build tmMesofact */
70 > extern void     tmMkMesofact(void);                     /* build tmMesofact */
71  
72 < #define returnErr(code) return(tmErrorReturn(funcName,code))
72 > #define returnErr(code) return(tmErrorReturn(funcName,tms,code))
73   #define returnOK        return(TM_E_OK)
74  
75   #define FEQ(a,b)        ((a) < (b)+1e-5 && (b) < (a)+1e-5)
# Line 74 | Line 78 | extern void    tmMkMesofact();                 /* build tmMesofact */
78                          &&FEQ((p1)[1][0],(p2)[1][0])&&FEQ((p1)[1][1],(p2)[1][1])\
79                          &&FEQ((p1)[2][0],(p2)[2][0])&&FEQ((p1)[2][1],(p2)[2][1])\
80                          &&FEQ((p1)[3][0],(p2)[3][0])&&FEQ((p1)[3][1],(p2)[3][1]))
77 –
81  
82   #ifdef __cplusplus
83   }

Diff Legend

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