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.16 by schorsch, Mon Jul 14 22:23:59 2003 UTC vs.
Revision 3.18 by greg, Fri Jan 7 21:41:06 2005 UTC

# Line 66 | Line 66 | extern "C" {
66   #endif
67  
68   extern char     *tmErrorMessage[];      /* error messages */
69 – extern int      tmLastError;            /* last error incurred by library */
70 – extern char     *tmLastFunction;        /* error-generating function name */
69  
70   typedef short   TMbright;               /* encoded luminance type */
71  
72                                  /* basic tone mapping data structure */
73 < extern struct tmStruct {
73 > typedef struct tmStruct {
74          int             flags;          /* flags of what to do */
75          RGBPRIMP        monpri;         /* monitor RGB primaries */
76          double          mongam;         /* monitor gamma value (approx.) */
# Line 85 | Line 83 | extern struct tmStruct {
83          int             *histo;         /* input histogram */
84          TMbright        mbrmin, mbrmax; /* mapped brightness limits */
85          unsigned short  *lumap;         /* computed luminance map */
88 –        struct tmStruct *tmprev;        /* previous tone mapping */
86          MEM_PTR         pd[TM_MAXPKG];  /* pointers to private data */
87 < }       *tmTop;                 /* current tone mapping stack */
87 >        int             lastError;      /* last error incurred */
88 >        const char      *lastFunc;      /* error-generating function name */
89 > } TMstruct;
90  
91                                  /* conversion package functions */
92   struct tmPackage {
93 <        MEM_PTR         (*Init)(struct tmStruct *tms);
94 <        void            (*NewSpace)(struct tmStruct *tms);
93 >        MEM_PTR         (*Init)(TMstruct *tms);
94 >        void            (*NewSpace)(TMstruct *tms);
95          void            (*Free)(MEM_PTR pp);
96   };
97                                  /* our list of conversion packages */
# Line 119 | Line 118 | extern int     tmNumPkgs;      /* number of registered packages
118   /****    Library Function Calls    ****/
119  
120  
121 < extern struct tmStruct *
121 > extern TMstruct *
122   tmInit(int flags, RGBPRIMP monpri, double gamval);
123   /*
124 <        Initialize new tone mapping and push it onto stack.
124 >        Allocate and initialize new tone mapping.
125  
126          flags   -       TM_F_* flags indicating what is to be done.
127          monpri  -       display monitor primaries (Note 1).
128          gamval  -       display gamma response (can be approximate).
129  
130 <        returns -       new tmTop, or NULL if insufficient memory.
130 >        returns -       new tone-mapping pointer, or NULL if no memory.
131   */
132  
133   extern int
134 < tmSetSpace(RGBPRIMP pri, double sf);
134 > tmSetSpace(TMstruct *tms, RGBPRIMP pri, double sf);
135   /*
136          Set color primaries and scale factor for incoming scanlines.
137  
138 +        tms     -       tone mapping structure pointer.
139          pri     -       RGB color input primaries (Note 1).
140          sf      -       scale factor to get to luminance in cd/m^2.
141  
# Line 143 | Line 143 | tmSetSpace(RGBPRIMP pri, double sf);
143   */
144  
145   extern void
146 < tmClearHisto(void);
146 > tmClearHisto(TMstruct *tms);
147   /*
148          Clear histogram for current tone mapping.
149 +
150 +        tms     -       tone mapping structure pointer.
151   */
152  
153   extern int
154 < tmAddHisto(TMbright *ls, int len, int wt);
154 > tmAddHisto(TMstruct *tms, TMbright *ls, int len, int wt);
155   /*
156          Add brightness values to current histogram.
157  
158 +        tms     -       tone mapping structure pointer.
159          ls      -       encoded luminance values.
160          len     -       number of luminance values.
161          wt      -       integer weight to use for each value (usually 1 or -1).
# Line 161 | Line 164 | tmAddHisto(TMbright *ls, int len, int wt);
164   */
165  
166   extern int
167 < tmFixedMapping(double expmult, double gamval);
167 > tmFixedMapping(TMstruct *tms, double expmult, double gamval);
168   /*
169          Assign a fixed, linear tone-mapping using the given multiplier,
170          which is the ratio of maximum output to uncalibrated input.
# Line 169 | Line 172 | tmFixedMapping(double expmult, double gamval);
172          until a new tone mapping is computed.
173          Only the min. and max. values are used from the histogram.
174          
175 +        tms     -       tone mapping structure pointer.
176          expmult -       the fixed exposure multiplier to use.
177          gamval  -       display gamma response (0. for default).
178 +
179          returns -       0 on success, TM_E_* on error.
180   */
181  
182   extern int
183 < tmComputeMapping(double gamval, double Lddyn, double Ldmax);
183 > tmComputeMapping(TMstruct *tms, double gamval, double Lddyn, double Ldmax);
184   /*
185          Compute tone mapping function from the current histogram.
186          This mapping will be used in subsequent calls to tmMapPixels()
187          until a new tone mapping is computed.
188          I.e., calls to tmAddHisto() have no immediate effect.
189  
190 +        tms     -       tone mapping structure pointer.
191          gamval  -       display gamma response (0. for default).
192          Lddyn   -       the display's dynamic range (0. for default).
193          Ldmax   -       maximum display luminance in cd/m^2 (0. for default).
# Line 190 | Line 196 | tmComputeMapping(double gamval, double Lddyn, double L
196   */
197  
198   extern int
199 < tmMapPixels(BYTE *ps, TMbright *ls, BYTE *cs, int len);
199 > tmMapPixels(TMstruct *tms, BYTE *ps, TMbright *ls, BYTE *cs, int len);
200   /*
201          Apply tone mapping function to pixel values.
202  
203 +        tms     -       tone mapping structure pointer.
204          ps      -       returned pixel values (Note 2).
205          ls      -       encoded luminance values.
206          cs      -       encoded chrominance values (Note 2).
# Line 202 | Line 209 | tmMapPixels(BYTE *ps, TMbright *ls, BYTE *cs, int len)
209          returns -       0 on success, TM_E_* on failure.
210   */
211  
212 < extern struct tmStruct *
213 < tmPop(void);
212 > extern TMstruct *
213 > tmDup(TMstruct *orig);
214   /*
215 <        Pops current tone mapping from stack.
215 >        Duplicate the given tone mapping into a new struct.
216  
217 <        returns -       pointer to tone mapping structure, or NULL if none.
211 < */
217 >        orig    -       tone mapping structure to duplicate.
218  
219 < extern int
214 < tmPull(struct tmStruct *tms);
215 < /*
216 <        Pull tone mapping from anywhere in stack.
217 <
218 <        tms     -       tone mapping structure to find.
219 <
220 <        returns -       1 if found in stack, 0 otherwise.
219 >        returns -       pointer to new struct, or NULL on error.
220   */
221  
223 – extern int
224 – tmPush(struct tmStruct *tms);
225 – /*
226 –        Make tone mapping active by (pulling it and) pushing it to the top.
227 –
228 –        tms     -       initialized tone mapping structure.
229 –
230 –        returns -       0 on success, TM_E_* if tms is invalid.
231 – */
232 –
233 – extern struct tmStruct *
234 – tmDup(void);
235 – /*
236 –        Duplicate the current tone mapping into a new structure on the stack.
237 –
238 –        returns -       pointer to new top, or NULL on error.
239 – */
240 –
222   extern void
223 < tmDone(struct tmStruct *tms);
223 > tmDone(TMstruct *tms);
224   /*
225          Free data associated with the given tone mapping structure.
245 –        Calls tmPull() first to remove it from the stack if present.
246 –        The calls tmDone(tmPop()), tmDone(tmTop) and tmDone(NULL)
247 –        all have the same effect, which is to remove and free
248 –        the current tone mapping.
226  
227          tms     -       tone mapping structure to free.
228   */
229  
230   extern int
231 < tmCvColors(TMbright *ls, BYTE *cs, COLOR *scan, int len);
231 > tmCvColors(TMstruct *tms, TMbright *ls, BYTE *cs, COLOR *scan, int len);
232   /*
233          Convert RGB/XYZ float scanline to encoded luminance and chrominance.
234  
235 +        tms     -       tone mapping structure pointer.
236          ls      -       returned encoded luminance values.
237          cs      -       returned encoded chrominance values (Note 2).
238          scan    -       input scanline.
# Line 264 | Line 242 | tmCvColors(TMbright *ls, BYTE *cs, COLOR *scan, int le
242   */
243  
244   extern int
245 < tmCvGrays(TMbright *ls, float *scan, int len);
245 > tmCvGrays(TMstruct *tms, TMbright *ls, float *scan, int len);
246   /*
247          Convert gray float scanline to encoded luminance.
248  
249 +        tms     -       tone mapping structure pointer.
250          ls      -       returned encoded luminance values.
251          scan    -       input scanline.
252          len     -       scanline length.
# Line 276 | Line 255 | tmCvGrays(TMbright *ls, float *scan, int len);
255   */
256  
257   extern int
258 < tmCvColrs(TMbright *ls, BYTE *cs, COLR *scan, int len);
258 > tmCvColrs(TMstruct *tms, TMbright *ls, BYTE *cs, COLR *scan, int len);
259   /*
260          Convert RGBE/XYZE scanline to encoded luminance and chrominance.
261  
262 +        tms     -       tone mapping structure pointer.
263          ls      -       returned encoded luminance values.
264          cs      -       returned encoded chrominance values (Note 2).
265          scan    -       input scanline.
# Line 289 | Line 269 | tmCvColrs(TMbright *ls, BYTE *cs, COLR *scan, int len)
269   */
270  
271   extern int
272 < tmLoadPicture(TMbright **lpp, BYTE **cpp, int *xp, int *yp,
272 > tmLoadPicture(TMstruct *tms, TMbright **lpp, BYTE **cpp, int *xp, int *yp,
273                  char *fname, FILE *fp);
274   /*
275          Load Radiance picture and convert to tone mapping representation.
# Line 297 | Line 277 | tmLoadPicture(TMbright **lpp, BYTE **cpp, int *xp, int
277          malloc(3), and should be freed with free(3) when no longer needed.
278          Calls tmSetSpace() to calibrate input color space.
279  
280 +        tms     -       tone mapping structure pointer.
281          lpp     -       returned array of encoded luminances, picture ordering.
282          cpp     -       returned array of encoded chrominances (Note 2).
283          xp, yp  -       returned picture dimensions.
# Line 312 | Line 293 | tmMapPicture(BYTE **psp, int *xp, int *yp, int flags,
293                  char *fname, FILE *fp);
294   /*
295          Load and apply tone mapping to Radiance picture.
315 –        Stack is restored to its original state upon return.
296          If fp is TM_GETFILE and (flags&TM_F_UNIMPL)!=0, tmMapPicture()
297          calls pcond to perform the actual conversion, which takes
298          longer but gives access to all the TM_F_* features.
# Line 333 | Line 313 | tmMapPicture(BYTE **psp, int *xp, int *yp, int flags,
313   */
314  
315   extern int
316 < tmCvRGB48(TMbright *ls, BYTE *cs, uint16 (*scan)[3], int len, double gv);
316 > tmCvRGB48(TMstruct *tms, TMbright *ls, BYTE *cs, uint16 (*scan)[3],
317 >                int len, double gv);
318   /*
319          Convert 48-bit RGB scanline to encoded luminance and chrominance.
320  
321 +        tms     -       tone mapping structure pointer.
322          ls      -       returned encoded luminance values.
323          cs      -       returned encoded chrominance values (Note 2).
324          scan    -       input scanline.
# Line 347 | Line 329 | tmCvRGB48(TMbright *ls, BYTE *cs, uint16 (*scan)[3], i
329   */
330  
331   extern int
332 < tmCvGray16(TMbright *ls, uint16 *scan, int len, double gv);
332 > tmCvGray16(TMstruct *tms, TMbright *ls, uint16 *scan, int len, double gv);
333   /*
334          Convert 16-bit gray scanline to encoded luminance.
335  
336 +        tms     -       tone mapping structure pointer.
337          ls      -       returned encoded luminance values.
338          scan    -       input scanline.
339          len     -       scanline length.

Diff Legend

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