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.9 by greg, Fri Jun 20 00:25:49 2003 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 + #ifdef __cplusplus
8 + extern "C" {
9 + #endif
10  
11 < /* ====================================================================
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 < */
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 + #include        "tifftypes.h"
19  
69 #ifdef __cplusplus
70 extern "C" {
71 #endif
72
20                                  /* required constants */
21   #ifndef M_LN2
22   #define M_LN2           0.69314718055994530942
# Line 101 | Line 48 | extern "C" {
48   #define BMESLOWER       ((int)(-5.18*TM_BRTSCALE-.5))
49   #define BMESUPPER       ((int)(1.73*TM_BRTSCALE+.5))
50   #endif
104
105 #ifndef int4
106 #define int4            int                     /* assume 32-bit integers */
107 #endif
51                                                  /* approximate scotopic lum. */
52   #define SCO_rf          0.062
53   #define SCO_gf          0.608
54   #define SCO_bf          0.330
55   #define scotlum(c)      (SCO_rf*(c)[RED] + SCO_gf*(c)[GRN] + SCO_bf*(c)[BLU])
56 < #define normscot(c)     ( (     (int4)(SCO_rf*256.+.5)*(c)[RED] + \
57 <                                (int4)(SCO_gf*256.+.5)*(c)[GRN] + \
58 <                                (int4)(SCO_bf*256.+.5)*(c)[BLU] ) >> 8 )
56 > #define normscot(c)     ( (     (int32)(SCO_rf*256.+.5)*(c)[RED] + \
57 >                                (int32)(SCO_gf*256.+.5)*(c)[GRN] + \
58 >                                (int32)(SCO_bf*256.+.5)*(c)[BLU]        ) >> 8 )
59  
60   #ifndef malloc
61   MEM_PTR         malloc();
# Line 135 | Line 78 | extern void    tmMkMesofact();                 /* build tmMesofact */
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]))
80  
81 +
82   #ifdef __cplusplus
83   }
84   #endif
85 + #endif /* _RAD_TMPRIVAT_H_ */
86 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines