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.13 by schorsch, Thu Jul 17 09:21:29 2003 UTC vs.
Revision 3.16 by greg, Thu Jul 3 03:30:21 2008 UTC

# Line 37 | 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 +
42   #define LMESLOWER       (5.62e-3)               /* lower mesopic limit */
43   #define LMESUPPER       (5.62)                  /* upper mesopic limit */
44   #if     (TM_BRTSCALE==128)
# Line 59 | Line 61 | extern "C" {
61   MEM_PTR         malloc();
62   MEM_PTR         calloc();
63   #endif
64 < extern int      tmErrorReturn(char*, int);
64 > extern int      tmErrorReturn(const char *, TMstruct *, int);
65  
66                                                  /* lookup for mesopic scaling */
67   extern BYTE     tmMesofact[BMESUPPER-BMESLOWER];
68  
69   extern void     tmMkMesofact(void);                     /* build tmMesofact */
70  
71 < #define returnErr(code) return(tmErrorReturn(funcName,code))
71 > #define returnErr(code) return(tmErrorReturn(funcName,tms,code))
72   #define returnOK        return(TM_E_OK)
73  
74   #define FEQ(a,b)        ((a) < (b)+1e-5 && (b) < (a)+1e-5)
# Line 75 | Line 77 | extern void    tmMkMesofact(void);                     /* build tmMesofact
77                          &&FEQ((p1)[1][0],(p2)[1][0])&&FEQ((p1)[1][1],(p2)[1][1])\
78                          &&FEQ((p1)[2][0],(p2)[2][0])&&FEQ((p1)[2][1],(p2)[2][1])\
79                          &&FEQ((p1)[3][0],(p2)[3][0])&&FEQ((p1)[3][1],(p2)[3][1]))
78
80  
81   #ifdef __cplusplus
82   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines