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

Comparing ray/src/common/tonemap.h (file contents):
Revision 3.27 by greg, Wed Jan 6 19:25:00 2021 UTC vs.
Revision 3.32 by greg, Sat Jan 15 16:57:46 2022 UTC

# Line 56 | Line 56 | extern "C" {
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  
64   /****    Global Data Types and Structures    ****/
65  
64 – #ifndef MEM_PTR
65 – #define MEM_PTR         void *
66 – #endif
66   #ifndef HIST_TYP
67   #define HIST_TYP        unsigned long
68   #endif
69 < #define TMAP_TYP        unsigned short
69 > #ifndef TMAP_TYP
70 > #define TMAP_TYP        uint16
71 > #endif
72  
73   extern char     *tmErrorMessage[];      /* error messages */
74  
# Line 82 | Line 83 | typedef struct {
83          int             cdiv[3];        /* computed color divisors */
84          RGBPRIMP        inppri;         /* current input primaries */
85          double          inpsf;          /* current input scalefactor */
86 <        MEM_PTR         inpdat;         /* current input client data */
86 >        void            *inpdat;        /* current input client data */
87          COLORMAT        cmat;           /* color conversion matrix */
88          TMbright        hbrmin, hbrmax; /* histogram brightness limits */      
89          HIST_TYP        *histo;         /* input histogram */
90          TMbright        mbrmin, mbrmax; /* mapped brightness limits */
91          TMAP_TYP        *lumap;         /* computed luminance map */
92 <        MEM_PTR         pd[TM_MAXPKG];  /* pointers to private data */
92 >        void            *pd[TM_MAXPKG]; /* pointers to private data */
93          int             lastError;      /* last error incurred */
94          const char      *lastFunc;      /* error-generating function name */
95   } TMstruct;
96  
97                                  /* conversion package functions */
98   struct tmPackage {
99 <        MEM_PTR         (*Init)(TMstruct *tms);
99 >        void *          (*Init)(TMstruct *tms);
100          void            (*NewSpace)(TMstruct *tms);
101 <        void            (*Free)(MEM_PTR pp);
101 >        void            (*Free)(void *pp);
102   };
103                                  /* our list of conversion packages */
104   extern struct tmPackage *tmPkg[TM_MAXPKG];
# Line 153 | Line 154 | tmInit(int flags, RGBPRIMP monpri, double gamval);
154   */
155  
156   extern int
157 < tmSetSpace(TMstruct *tms, RGBPRIMP pri, double sf, MEM_PTR dat);
157 > tmSetSpace(TMstruct *tms, RGBPRIMP pri, double sf, void *dat);
158   /*
159          Set color primaries and scale factor for incoming scanlines.
160  
# Line 187 | Line 188 | tmAddHisto(TMstruct *tms, TMbright *ls, int len, int w
188   */
189  
190   extern int
191 < tmFixedMapping(TMstruct *tms, double expmult, double gamval);
191 > tmFixedMapping(TMstruct *tms, double expmult, double gamval, double Lddyn);
192   /*
193          Assign a fixed, linear tone-mapping using the given multiplier,
194          which is the ratio of maximum output to uncalibrated input.
# Line 198 | Line 199 | tmFixedMapping(TMstruct *tms, double expmult, double g
199          tms     -       tone mapping structure pointer.
200          expmult -       the fixed exposure multiplier to use.
201          gamval  -       display gamma response (0. for default).
202 +        Lddyn   -       the display's dynamic range (0. for default).
203  
204          returns -       0 on success, TM_E_* on error.
205   */

Diff Legend

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