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.5 by gwlarson, Mon Aug 17 17:58:46 1998 UTC vs.
Revision 3.7 by greg, Tue Feb 25 02:47:22 2003 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1998 Silicon Graphics, Inc. */
2 <
3 < /* SCCSid "$SunId$ SGI" */
4 <
1 > /* RCSid $Id$ */
2   /*
3   * Private header file for tone mapping routines.
4   */
5  
6 < #undef  NOPROTO
7 < #define NOPROTO         1
6 > #include "copyright.h"
7 >
8   #ifndef MEM_PTR
9 < #define MEM_PTR         char *
9 > #define MEM_PTR         void *
10   #endif
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 29 | Line 30
30   #define MINLDMAX        1.
31   #define DEFLDMAX        100.
32  
33 < #define BRT2SCALE       ((int)(M_LN2*TM_BRTSCALE+.5))
33 > #define BRT2SCALE(l2)   (int)(M_LN2*TM_BRTSCALE*(l2) + ((l2)>0 ? .5 : -.5))
34  
35   #define HISTEP          8               /* steps in BRTSCALE for each bin */
36  
# Line 64 | Line 65 | MEM_PTR                calloc();
65   #endif
66   extern int      tmErrorReturn();
67  
68 +                                                /* lookup for mesopic scaling */
69 + extern BYTE     tmMesofact[BMESUPPER-BMESLOWER];
70 +
71 + extern void     tmMkMesofact();                 /* build tmMesofact */
72 +
73   #define returnErr(code) return(tmErrorReturn(funcName,code))
74   #define returnOK        return(TM_E_OK)
75  
76   #define FEQ(a,b)        ((a) < (b)+1e-5 && (b) < (a)+1e-5)
77  
78 < #define PRIMEQ(p1,p2)   (FEQ((p1)[0][0],(p2)[0][0])&&FEQ((p1)[0][1],(p2)[0][2])\
79 <                        &&FEQ((p1)[1][0],(p2)[1][0])&&FEQ((p1)[1][1],(p2)[1][2])\
80 <                        &&FEQ((p1)[2][0],(p2)[2][0])&&FEQ((p1)[2][1],(p2)[2][2])\
81 <                        &&FEQ((p1)[3][0],(p2)[3][0])&&FEQ((p1)[3][1],(p2)[3][2]))
78 > #define PRIMEQ(p1,p2)   (FEQ((p1)[0][0],(p2)[0][0])&&FEQ((p1)[0][1],(p2)[0][1])\
79 >                        &&FEQ((p1)[1][0],(p2)[1][0])&&FEQ((p1)[1][1],(p2)[1][1])\
80 >                        &&FEQ((p1)[2][0],(p2)[2][0])&&FEQ((p1)[2][1],(p2)[2][1])\
81 >                        &&FEQ((p1)[3][0],(p2)[3][0])&&FEQ((p1)[3][1],(p2)[3][1]))
82 >
83 > #ifdef __cplusplus
84 > }
85 > #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines