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.10 by gwlarson, Sun Dec 20 16:38:29 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 48 | Line 49
49  
50   #define TM_BRTSCALE     128             /* brightness scale factor (integer) */
51  
52 + #define TM_NOBRT        (-1<<15)        /* bogus brightness value */
53 +
54   #define TM_MAXPKG       8               /* maximum number of color formats */
55  
56  
# Line 73 | Line 76 | extern struct tmStruct {
76          RGBPRIMP        inppri;         /* current input primaries */
77          double          inpsf;          /* current input scalefactor */
78          COLORMAT        cmat;           /* color conversion matrix */
79 <        TMbright        brmin, brmax;   /* input brightness limits */  
79 >        TMbright        hbrmin, hbrmax; /* histogram brightness limits */      
80          int             *histo;         /* input histogram */
81 +        TMbright        mbrmin, mbrmax; /* mapped brightness limits */
82          unsigned short  *lumap;         /* computed luminance map */
83          struct tmStruct *tmprev;        /* previous tone mapping */
84          MEM_PTR         pd[TM_MAXPKG];  /* pointers to private data */
# Line 197 | Line 201 | tmAddHisto(TMbright *ls, int len, int wt);
201   extern int
202   tmComputeMapping(double gamval, double Lddyn, double Ldmax);
203   /*
204 <        Compute tone mapping function.
204 >        Compute tone mapping function.  This mapping will be used
205 >        in subsequent calls to tmMapPixels() until a new tone mapping
206 >        is computed.  I.e., calls to tmAddHisto() have no immediate effect.
207  
208          gamval  -       display gamma response (0. for default).
209          Lddyn   -       the display's dynamic range (0. for default).
# Line 228 | Line 234 | tmLoadPicture(TMbright **lpp, BYTE **cpp, int *xp, int
234          malloc(3), and should be freed with free(3) when no longer needed.
235          Calls tmSetSpace() to calibrate input color space.
236  
237 <        lpp     -       returned array of encoded luminances, English ordering.
237 >        lpp     -       returned array of encoded luminances, picture ordering.
238          cpp     -       returned array of encoded chrominances (Note 2).
239          xp, yp  -       returned picture dimensions.
240          fname   -       picture file name.
# Line 250 | Line 256 | tmMapPicture(BYTE **psp, int *xp, int *yp, int flags,
256          Memory for the final pixel array is allocated using malloc(3),
257          and should be freed with free(3) when it is no longer needed.
258  
259 <        psp     -       returned array of tone mapped pixels, English ordering.
259 >        psp     -       returned array of tone mapped pixels, picture ordering.
260          xp, yp  -       returned picture dimensions.
261          flags   -       TM_F_* flags indicating what is to be done.
262          monpri  -       display monitor primaries (Note 1).

Diff Legend

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