ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/tmprivat.h

Comparing ray/src/common/tmprivat.h (file contents):
Revision 3.1 by greg, Tue Apr 15 16:53:05 1997 UTC vs.
Revision 3.8 by schorsch, Fri Jun 6 16:38:47 2003 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1997 Regents of the University of California */
2	<
3	<	/* SCCSid "$SunId$ LBL" */
4	<
1	>	/* RCSid $Id$ */
2		/*
3		* Private header file for tone mapping routines.
4		*/
5	+	#ifndef _RAD_TMPRIVAT_H_
6	+	#define _RAD_TMPRIVAT_H_
7	+	#ifdef __cplusplus
8	+	extern "C" {
9	+	#endif
10
11	<	#undef  NOPROTO
12	<	#define NOPROTO         1
11	>	#include "copyright.h"
12	>
13	>	#ifndef MEM_PTR
14	>	#define MEM_PTR         void *
15	>	#endif
16	>	#include        "color.h"
17		#include        "tonemap.h"
18	+
19	+	/* required constants */
20	+	#ifndef M_LN2
21	+	#define M_LN2           0.69314718055994530942
22	+	#endif
23	+	#ifndef M_LN10
24	+	#define M_LN10          2.30258509299404568402
25	+	#endif
26		/* minimum values and defaults */
27		#define MINGAM          0.75
28		#define DEFGAM          2.2
#	Line 17 | Line 31
31		#define MINLDMAX        1.
32		#define DEFLDMAX        100.
33
34	<	/* private flags */
21	<	#define TM_F_INITED     010000          /* initialized flag */
22	<	#define TM_F_NEEDMAT    020000          /* need matrix conversion */
34	>	#define BRT2SCALE(l2)   (int)(M_LN2*TM_BRTSCALE*(l2) + ((l2)>0 ? .5 : -.5))
35
24	–	#define BRT2SCALE       ((int)(M_LN2*TM_BRTSCALE+.5))
25	–
36		#define HISTEP          8               /* steps in BRTSCALE for each bin */
37
38		#define MINBRT          (-16*TM_BRTSCALE)       /* minimum usable brightness */
39		#define MINLUM          (1.125352e-7)           /* tmLuminance(MINBRT) */
40
41		#define LMESLOWER       (5.62e-3)               /* lower mesopic limit */
32	–	#define BMESLOWER       ((int)(-5.18*TM_BRTSCALE-.5))
42		#define LMESUPPER       (5.62)                  /* upper mesopic limit */
43	+	#if     (TM_BRTSCALE==128)
44	+	#define BMESLOWER       (-663)                  /* encoded LMESLOWER */
45	+	#define BMESUPPER       (221)                   /* encoded LMESUPPER */
46	+	#else
47	+	#define BMESLOWER       ((int)(-5.18*TM_BRTSCALE-.5))
48		#define BMESUPPER       ((int)(1.73*TM_BRTSCALE+.5))
49	+	#endif
50
51		#ifndef int4
52		#define int4            int                     /* assume 32-bit integers */
#	Line 46 | Line 61
61		(int4)(SCO_bf*256.+.5)*(c)[BLU] ) >> 8 )
62
63		#ifndef malloc
64	<	extern char     *malloc(), *calloc();
64	>	MEM_PTR         malloc();
65	>	MEM_PTR         calloc();
66		#endif
67		extern int      tmErrorReturn();
68
69	+	/* lookup for mesopic scaling */
70	+	extern BYTE     tmMesofact[BMESUPPER-BMESLOWER];
71	+
72	+	extern void     tmMkMesofact();                 /* build tmMesofact */
73	+
74		#define returnErr(code) return(tmErrorReturn(funcName,code))
75		#define returnOK        return(TM_E_OK)
76
77		#define FEQ(a,b)        ((a) < (b)+1e-5 && (b) < (a)+1e-5)
78
79	<	#define PRIMEQ(p1,p2)   (FEQ((p1)[0][0],(p2)[0][0])&&FEQ((p1)[0][1],(p2)[0][2])\
80	<	&&FEQ((p1)[1][0],(p2)[1][0])&&FEQ((p1)[1][1],(p2)[1][2])\
81	<	&&FEQ((p1)[2][0],(p2)[2][0])&&FEQ((p1)[2][1],(p2)[2][2])\
82	<	&&FEQ((p1)[3][0],(p2)[3][0])&&FEQ((p1)[3][1],(p2)[3][2]))
79	>	#define PRIMEQ(p1,p2)   (FEQ((p1)[0][0],(p2)[0][0])&&FEQ((p1)[0][1],(p2)[0][1])\
80	>	&&FEQ((p1)[1][0],(p2)[1][0])&&FEQ((p1)[1][1],(p2)[1][1])\
81	>	&&FEQ((p1)[2][0],(p2)[2][0])&&FEQ((p1)[2][1],(p2)[2][1])\
82	>	&&FEQ((p1)[3][0],(p2)[3][0])&&FEQ((p1)[3][1],(p2)[3][1]))
83	>
84	>
85	>	#ifdef __cplusplus
86	>	}
87	>	#endif
88	>	#endif /* _RAD_TMPRIVAT_H_ */
89	>

Diff Legend

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