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.31 by greg, Thu Mar 18 16:56:03 2021 UTC vs.
Revision 3.32 by greg, Sat Jan 15 16:57:46 2022 UTC

# Line 63 | Line 63 | extern "C" {
63  
64   /****    Global Data Types and Structures    ****/
65  
66 – #ifndef MEM_PTR
67 – #define MEM_PTR         void *
68 – #endif
66   #ifndef HIST_TYP
67   #define HIST_TYP        unsigned long
68   #endif
# Line 86 | 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 157 | 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  

Diff Legend

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