53 |
|
|
54 |
|
#define TM_BRTSCALE 256 /* brightness scale factor (integer) */ |
55 |
|
|
56 |
< |
#define TM_NOBRT (-1<<15) /* bogus brightness value */ |
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 |
|
|
66 |
< |
#ifndef MEM_PTR |
67 |
< |
#define MEM_PTR void * |
66 |
> |
#ifndef HIST_TYP |
67 |
> |
#define HIST_TYP unsigned long |
68 |
|
#endif |
69 |
+ |
#ifndef TMAP_TYP |
70 |
+ |
#define TMAP_TYP uint16 |
71 |
+ |
#endif |
72 |
|
|
73 |
|
extern char *tmErrorMessage[]; /* error messages */ |
74 |
|
|
83 |
|
int cdiv[3]; /* computed color divisors */ |
84 |
|
RGBPRIMP inppri; /* current input primaries */ |
85 |
|
double inpsf; /* current input scalefactor */ |
81 |
– |
MEM_PTR inpdat; /* current input client data */ |
86 |
|
COLORMAT cmat; /* color conversion matrix */ |
87 |
|
TMbright hbrmin, hbrmax; /* histogram brightness limits */ |
88 |
< |
int *histo; /* input histogram */ |
88 |
> |
HIST_TYP *histo; /* input histogram */ |
89 |
|
TMbright mbrmin, mbrmax; /* mapped brightness limits */ |
90 |
< |
unsigned short *lumap; /* computed luminance map */ |
91 |
< |
MEM_PTR pd[TM_MAXPKG]; /* pointers to private data */ |
90 |
> |
TMAP_TYP *lumap; /* computed luminance map */ |
91 |
> |
void *pd[TM_MAXPKG]; /* pointers to private data */ |
92 |
|
int lastError; /* last error incurred */ |
93 |
|
const char *lastFunc; /* error-generating function name */ |
94 |
|
} TMstruct; |
95 |
|
|
96 |
|
/* conversion package functions */ |
97 |
|
struct tmPackage { |
98 |
< |
MEM_PTR (*Init)(TMstruct *tms); |
98 |
> |
void * (*Init)(TMstruct *tms); |
99 |
|
void (*NewSpace)(TMstruct *tms); |
100 |
< |
void (*Free)(MEM_PTR pp); |
100 |
> |
void (*Free)(void *pp); |
101 |
|
}; |
102 |
|
/* our list of conversion packages */ |
103 |
|
extern struct tmPackage *tmPkg[TM_MAXPKG]; |
153 |
|
*/ |
154 |
|
|
155 |
|
extern int |
156 |
< |
tmSetSpace(TMstruct *tms, RGBPRIMP pri, double sf, MEM_PTR dat); |
156 |
> |
tmSetSpace(TMstruct *tms, RGBPRIMP pri, double sf); |
157 |
|
/* |
158 |
|
Set color primaries and scale factor for incoming scanlines. |
159 |
|
|
160 |
|
tms - tone mapping structure pointer. |
161 |
|
pri - RGB color input primaries (Note 1). |
162 |
|
sf - scale factor to get to luminance in cd/m^2. |
159 |
– |
dat - application-specific data (NULL if not needed) |
163 |
|
|
164 |
|
returns - 0 on success, TM_E_* code on failure. |
165 |
|
*/ |
186 |
|
*/ |
187 |
|
|
188 |
|
extern int |
189 |
< |
tmFixedMapping(TMstruct *tms, double expmult, double gamval); |
189 |
> |
tmFixedMapping(TMstruct *tms, double expmult, double gamval, double Lddyn); |
190 |
|
/* |
191 |
|
Assign a fixed, linear tone-mapping using the given multiplier, |
192 |
|
which is the ratio of maximum output to uncalibrated input. |
197 |
|
tms - tone mapping structure pointer. |
198 |
|
expmult - the fixed exposure multiplier to use. |
199 |
|
gamval - display gamma response (0. for default). |
200 |
+ |
Lddyn - the display's dynamic range (0. for default). |
201 |
|
|
202 |
|
returns - 0 on success, TM_E_* on error. |
203 |
|
*/ |