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.6 by gregl, Tue Jul 29 11:54:45 1997 UTC vs.
Revision 3.9 by gwlarson, Mon Oct 5 16:49:52 1998 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1997 Regents of the University of California */
1 > /* Copyright (c) 1998 Silicon Graphics, Inc. */
2  
3 < /* SCCSid "$SunId$ LBL" */
3 > /* SCCSid "$SunId$ SGI" */
4  
5   /*
6   * Header file for tone mapping functions.
7 + *
8 + * Include after "color.h"
9   */
8 –                                /* required non-system header files */
9 – #include        "color.h"
10  
11  
12   /****    Argument Macros    ****/
# Line 32 | Line 32
32   #define TM_NOCHROMP     (BYTE **)NULL   /* indicate no chrominances */
33   #define TM_GETFILE      (FILE *)NULL    /* indicate file must be opened */
34  
35 +
36   /****    Error Return Values    ****/
37  
38   #define TM_E_OK         0               /* normal return status */
# Line 73 | Line 74 | extern struct tmStruct {
74          RGBPRIMP        inppri;         /* current input primaries */
75          double          inpsf;          /* current input scalefactor */
76          COLORMAT        cmat;           /* color conversion matrix */
77 <        TMbright        brmin, brmax;   /* input brightness limits */  
77 >        TMbright        hbrmin, hbrmax; /* histogram brightness limits */      
78          int             *histo;         /* input histogram */
79 +        TMbright        mbrmin, mbrmax; /* mapped brightness limits */
80          unsigned short  *lumap;         /* computed luminance map */
81          struct tmStruct *tmprev;        /* previous tone mapping */
82          MEM_PTR         pd[TM_MAXPKG];  /* pointers to private data */
# Line 197 | Line 199 | tmAddHisto(TMbright *ls, int len, int wt);
199   extern int
200   tmComputeMapping(double gamval, double Lddyn, double Ldmax);
201   /*
202 <        Compute tone mapping function.
202 >        Compute tone mapping function.  This mapping will be used
203 >        in subsequent calls to tmMapPixels() until a new tone mapping
204 >        is computed.  I.e., calls to tmAddHisto() have no immediate effect.
205  
206          gamval  -       display gamma response (0. for default).
207          Lddyn   -       the display's dynamic range (0. for default).
# Line 228 | Line 232 | tmLoadPicture(TMbright **lpp, BYTE **cpp, int *xp, int
232          malloc(3), and should be freed with free(3) when no longer needed.
233          Calls tmSetSpace() to calibrate input color space.
234  
235 <        lpp     -       returned array of encoded luminances, English ordering.
235 >        lpp     -       returned array of encoded luminances, picture ordering.
236          cpp     -       returned array of encoded chrominances (Note 2).
237          xp, yp  -       returned picture dimensions.
238          fname   -       picture file name.
# Line 250 | Line 254 | tmMapPicture(BYTE **psp, int *xp, int *yp, int flags,
254          Memory for the final pixel array is allocated using malloc(3),
255          and should be freed with free(3) when it is no longer needed.
256  
257 <        psp     -       returned array of tone mapped pixels, English ordering.
257 >        psp     -       returned array of tone mapped pixels, picture ordering.
258          xp, yp  -       returned picture dimensions.
259          flags   -       TM_F_* flags indicating what is to be done.
260          monpri  -       display monitor primaries (Note 1).

Diff Legend

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