ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/src/common/tonemap.h
(Generate patch)

Comparing src/common/tonemap.h (file contents):
Revision 3.26 by greg, Fri May 20 02:06:38 2011 UTC vs.
Revision 3.30 by greg, Tue Mar 2 20:09:14 2021 UTC

# Line 53 | Line 53 | extern "C" {
53  
54   #define TM_BRTSCALE     256             /* brightness scale factor (integer) */
55  
56 < #define TM_NOBRT        (-1<<15)        /* bogus brightness value */
56 > #define TM_NOBRT        (~0x7fff)       /* bogus brightness value */
57   #define TM_NOLUM        (1e-17)         /* ridiculously small luminance */
58  
59 + #define TM_BRES         4096            /* luminance tone-map resolution */
60 +
61   #define TM_MAXPKG       8               /* maximum number of color formats */
62  
63  
# Line 64 | Line 66 | extern "C" {
66   #ifndef MEM_PTR
67   #define MEM_PTR         void *
68   #endif
69 + #ifndef HIST_TYP
70 + #define HIST_TYP        unsigned long
71 + #endif
72 + #ifndef TMAP_TYP
73 + #define TMAP_TYP        uint16
74 + #endif
75  
76   extern char     *tmErrorMessage[];      /* error messages */
77  
# Line 81 | Line 89 | typedef struct {
89          MEM_PTR         inpdat;         /* current input client data */
90          COLORMAT        cmat;           /* color conversion matrix */
91          TMbright        hbrmin, hbrmax; /* histogram brightness limits */      
92 <        int             *histo;         /* input histogram */
92 >        HIST_TYP        *histo;         /* input histogram */
93          TMbright        mbrmin, mbrmax; /* mapped brightness limits */
94 <        unsigned short  *lumap;         /* computed luminance map */
94 >        TMAP_TYP        *lumap;         /* computed luminance map */
95          MEM_PTR         pd[TM_MAXPKG];  /* pointers to private data */
96          int             lastError;      /* last error incurred */
97          const char      *lastFunc;      /* error-generating function name */
# Line 183 | Line 191 | tmAddHisto(TMstruct *tms, TMbright *ls, int len, int w
191   */
192  
193   extern int
194 < tmFixedMapping(TMstruct *tms, double expmult, double gamval);
194 > tmFixedMapping(TMstruct *tms, double expmult, double gamval, double Lddyn);
195   /*
196          Assign a fixed, linear tone-mapping using the given multiplier,
197          which is the ratio of maximum output to uncalibrated input.
# Line 194 | Line 202 | tmFixedMapping(TMstruct *tms, double expmult, double g
202          tms     -       tone mapping structure pointer.
203          expmult -       the fixed exposure multiplier to use.
204          gamval  -       display gamma response (0. for default).
205 +        Ldmax   -       maximum display luminance in cd/m^2 (0. for default).
206  
207          returns -       0 on success, TM_E_* on error.
208   */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines