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.6 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 3.23 by greg, Mon Mar 7 20:49:19 2011 UTC

# Line 1 | Line 1
1 < /* RCSid: $Id$ */
1 > /* RCSid $Id$ */
2   /*
3   * Private header file for tone mapping routines.
4   */
5 + #ifndef _RAD_TMPRIVAT_H_
6 + #define _RAD_TMPRIVAT_H_
7  
6 /* ====================================================================
7 * The Radiance Software License, Version 1.0
8 *
9 * Copyright (c) 1990 - 2002 The Regents of the University of California,
10 * through Lawrence Berkeley National Laboratory.   All rights reserved.
11 *
12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions
14 * are met:
15 *
16 * 1. Redistributions of source code must retain the above copyright
17 *         notice, this list of conditions and the following disclaimer.
18 *
19 * 2. Redistributions in binary form must reproduce the above copyright
20 *       notice, this list of conditions and the following disclaimer in
21 *       the documentation and/or other materials provided with the
22 *       distribution.
23 *
24 * 3. The end-user documentation included with the redistribution,
25 *           if any, must include the following acknowledgment:
26 *             "This product includes Radiance software
27 *                 (http://radsite.lbl.gov/)
28 *                 developed by the Lawrence Berkeley National Laboratory
29 *               (http://www.lbl.gov/)."
30 *       Alternately, this acknowledgment may appear in the software itself,
31 *       if and wherever such third-party acknowledgments normally appear.
32 *
33 * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
34 *       and "The Regents of the University of California" must
35 *       not be used to endorse or promote products derived from this
36 *       software without prior written permission. For written
37 *       permission, please contact [email protected].
38 *
39 * 5. Products derived from this software may not be called "Radiance",
40 *       nor may "Radiance" appear in their name, without prior written
41 *       permission of Lawrence Berkeley National Laboratory.
42 *
43 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
44 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
45 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
46 * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
47 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
48 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
49 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
50 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
51 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
52 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
53 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
54 * SUCH DAMAGE.
55 * ====================================================================
56 *
57 * This software consists of voluntary contributions made by many
58 * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
59 * information on Lawrence Berkeley National Laboratory, please see
60 * <http://www.lbl.gov/>.
61 */
62
8   #ifndef MEM_PTR
9   #define MEM_PTR         void *
10   #endif
# Line 85 | Line 30 | extern "C" {
30   #define MINLDMAX        1.
31   #define DEFLDMAX        100.
32  
33 < #define BRT2SCALE(l2)   (int)(M_LN2*TM_BRTSCALE*(l2) + ((l2)>0 ? .5 : -.5))
33 > #define BRT2SCALE(l2)   (int)(M_LN2*TM_BRTSCALE*(l2) + .5 - ((l2) < 0))
34  
35 < #define HISTEP          8               /* steps in BRTSCALE for each bin */
35 > #define HISTEP          16              /* steps in BRTSCALE for each bin */
36  
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 */
97 #if     (TM_BRTSCALE==128)
98 #define BMESLOWER       (-663)                  /* encoded LMESLOWER */
99 #define BMESUPPER       (221)                   /* encoded LMESUPPER */
100 #else
45   #define BMESLOWER       ((int)(-5.18*TM_BRTSCALE-.5))
46   #define BMESUPPER       ((int)(1.73*TM_BRTSCALE+.5))
103 #endif
47  
105 #ifndef int4
106 #define int4            int                     /* assume 32-bit integers */
107 #endif
48                                                  /* approximate scotopic lum. */
49   #define SCO_rf          0.062
50   #define SCO_gf          0.608
51   #define SCO_bf          0.330
52   #define scotlum(c)      (SCO_rf*(c)[RED] + SCO_gf*(c)[GRN] + SCO_bf*(c)[BLU])
53 < #define normscot(c)     ( (     (int4)(SCO_rf*256.+.5)*(c)[RED] + \
54 <                                (int4)(SCO_gf*256.+.5)*(c)[GRN] + \
55 <                                (int4)(SCO_bf*256.+.5)*(c)[BLU] ) >> 8 )
53 > #define normscot(c)     ( (     (int32)(SCO_rf*256.+.5)*(c)[RED] + \
54 >                                (int32)(SCO_gf*256.+.5)*(c)[GRN] + \
55 >                                (int32)(SCO_bf*256.+.5)*(c)[BLU]        ) >> 8 )
56  
57 < #ifndef malloc
118 < MEM_PTR         malloc();
119 < MEM_PTR         calloc();
120 < #endif
121 < extern int      tmErrorReturn();
57 > extern int      tmNewMap(TMstruct *tms);        /* allocate new tone-mapping */
58  
59 + extern int      tmErrorReturn(const char *, TMstruct *, int);
60 +
61                                                  /* lookup for mesopic scaling */
62   extern BYTE     tmMesofact[BMESUPPER-BMESLOWER];
63  
64 < extern void     tmMkMesofact();                 /* build tmMesofact */
64 > extern void     tmMkMesofact(void);                     /* build tmMesofact */
65  
66 < #define returnErr(code) return(tmErrorReturn(funcName,code))
66 > #define returnErr(code) return(tmErrorReturn(funcName,tms,code))
67   #define returnOK        return(TM_E_OK)
68  
69   #define FEQ(a,b)        ((a) < (b)+1e-5 && (b) < (a)+1e-5)
# Line 138 | Line 76 | extern void    tmMkMesofact();                 /* build tmMesofact */
76   #ifdef __cplusplus
77   }
78   #endif
79 + #endif /* _RAD_TMPRIVAT_H_ */
80 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines