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.10 by greg, Fri Jun 27 06:53:22 2003 UTC vs.
Revision 3.14 by greg, Fri Jan 7 20:33:02 2005 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 *
10   #endif
11   #include        "color.h"
12   #include        "tonemap.h"
16 #include        "tifftypes.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 59 | Line 59 | extern "C" {
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 75 | Line 75 | extern void    tmMkMesofact();                 /* build tmMesofact */
75                          &&FEQ((p1)[1][0],(p2)[1][0])&&FEQ((p1)[1][1],(p2)[1][1])\
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
78  
79   #ifdef __cplusplus
80   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines