1 |
– |
/* Copyright (c) 1997 Regents of the University of California */ |
2 |
– |
|
1 |
|
#ifndef lint |
2 |
< |
static char SCCSid[] = "$SunId$ LBL"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
6 |
– |
|
4 |
|
/* |
5 |
|
* Routines for tone mapping on Radiance RGBE and XYZE pictures. |
6 |
< |
* See tonemap.h for detailed function descriptions. |
6 |
> |
* |
7 |
> |
* Externals declared in tonemap.h |
8 |
|
*/ |
9 |
|
|
10 |
+ |
#include "copyright.h" |
11 |
+ |
|
12 |
|
#include <stdio.h> |
13 |
+ |
#include <string.h> |
14 |
|
#include <math.h> |
15 |
+ |
#include <time.h> |
16 |
+ |
|
17 |
|
#include "tmprivat.h" |
18 |
|
#include "resolu.h" |
19 |
+ |
#ifdef PCOND |
20 |
+ |
#include "rtprocess.h" |
21 |
+ |
#endif |
22 |
|
|
23 |
+ |
#define GAMTSZ 1024 |
24 |
|
|
25 |
< |
extern char *tempbuffer(); |
25 |
> |
typedef struct { |
26 |
> |
BYTE gamb[GAMTSZ]; /* gamma lookup table */ |
27 |
> |
int clfb[3]; /* encoded tm->clf */ |
28 |
> |
int32 cmatb[3][3]; /* encoded color transform */ |
29 |
> |
TMbright inpsfb; /* encoded tm->inpsf */ |
30 |
> |
} COLRDATA; |
31 |
|
|
32 |
+ |
static MEM_PTR colrInit(TMstruct *); |
33 |
+ |
static void colrNewSpace(TMstruct *); |
34 |
+ |
static gethfunc headline; |
35 |
+ |
|
36 |
+ |
static struct tmPackage colrPkg = { /* our package functions */ |
37 |
+ |
colrInit, colrNewSpace, free |
38 |
+ |
}; |
39 |
+ |
static int colrReg = -1; /* our package registration number */ |
40 |
+ |
|
41 |
|
#define LOGISZ 260 |
42 |
|
static TMbright logi[LOGISZ]; |
22 |
– |
static BYTE photofact[BMESUPPER-BMESLOWER]; |
43 |
|
|
44 |
|
|
45 |
|
int |
46 |
< |
tmCvColrs(ls, cs, scan, len) /* tone map RGBE/XYZE colors */ |
47 |
< |
TMbright *ls; |
48 |
< |
BYTE *cs; |
49 |
< |
COLR *scan; |
50 |
< |
int len; |
46 |
> |
tmCvColrs( /* convert RGBE/XYZE colors */ |
47 |
> |
TMstruct *tms, |
48 |
> |
TMbright *ls, |
49 |
> |
BYTE *cs, |
50 |
> |
COLR *scan, |
51 |
> |
int len |
52 |
> |
) |
53 |
|
{ |
54 |
< |
static char funcName[] = "tmCvColrs"; |
55 |
< |
COLR cmon; |
56 |
< |
register int i, bi, li; |
54 |
> |
static const char funcName[] = "tmCvColrs"; |
55 |
> |
int cmon[4]; |
56 |
> |
register COLRDATA *cd; |
57 |
> |
register int i, j, li, bi; |
58 |
> |
int32 vl; |
59 |
|
|
60 |
< |
if (tmTop == NULL) |
60 |
> |
if (tms == NULL) |
61 |
|
returnErr(TM_E_TMINVAL); |
62 |
< |
if (ls == NULL | scan == NULL | len <= 0) |
62 |
> |
if ((ls == NULL) | (scan == NULL) | (len < 0)) |
63 |
|
returnErr(TM_E_ILLEGAL); |
64 |
< |
if (tmTop->flags & TM_F_NEEDMAT) { /* need floating point */ |
65 |
< |
register COLOR *newscan; |
66 |
< |
newscan = (COLOR *)tempbuffer(len*sizeof(COLOR)); |
67 |
< |
if (newscan == NULL) |
44 |
< |
returnErr(TM_E_NOMEM); |
45 |
< |
for (i = len; i--; ) |
46 |
< |
colr_color(newscan[i], scan[i]); |
47 |
< |
return(tmCvColors(ls, cs, newscan, len)); |
48 |
< |
} |
49 |
< |
if (logi[0] == 0) { /* build tables if necessary */ |
64 |
> |
if (colrReg < 0) { /* build tables if necessary */ |
65 |
> |
colrReg = tmRegPkg(&colrPkg); |
66 |
> |
if (colrReg < 0) |
67 |
> |
returnErr(TM_E_CODERR1); |
68 |
|
for (i = 256; i--; ) |
69 |
|
logi[i] = TM_BRTSCALE*log((i+.5)/256.) - .5; |
70 |
|
for (i = 256; i < LOGISZ; i++) |
71 |
< |
logi[i] = logi[255]; |
72 |
< |
for (i = BMESLOWER; i < BMESUPPER; i++) |
55 |
< |
photofact[i-BMESLOWER] = 256. * |
56 |
< |
(tmLuminance(i) - LMESLOWER) / |
57 |
< |
(LMESUPPER - LMESLOWER); |
71 |
> |
logi[i] = 0; |
72 |
> |
tmMkMesofact(); |
73 |
|
} |
74 |
+ |
if ((cd = (COLRDATA *)tmPkgData(tms,colrReg)) == NULL) |
75 |
+ |
returnErr(TM_E_NOMEM); |
76 |
|
for (i = len; i--; ) { |
77 |
< |
copycolr(cmon, scan[i]); |
77 |
> |
if (tmNeedMatrix(tms)) { /* apply color xform */ |
78 |
> |
for (j = 3; j--; ) { |
79 |
> |
vl = cd->cmatb[j][RED]*(int32)scan[i][RED] + |
80 |
> |
cd->cmatb[j][GRN]*(int32)scan[i][GRN] + |
81 |
> |
cd->cmatb[j][BLU]*(int32)scan[i][BLU] ; |
82 |
> |
if (vl < 0) cmon[j] = vl/0x10000; |
83 |
> |
else cmon[j] = vl>>16; |
84 |
> |
} |
85 |
> |
cmon[EXP] = scan[i][EXP]; |
86 |
> |
} else |
87 |
> |
copycolr(cmon, scan[i]); |
88 |
|
/* world luminance */ |
89 |
< |
li = ( tmTop->clfb[RED]*cmon[RED] + |
90 |
< |
tmTop->clfb[GRN]*cmon[GRN] + |
91 |
< |
tmTop->clfb[BLU]*cmon[BLU] ) >> 8; |
92 |
< |
bi = BRT2SCALE*(cmon[EXP]-COLXS) + |
93 |
< |
logi[li] + tmTop->inpsfb; |
94 |
< |
if (bi < MINBRT) { |
95 |
< |
bi = MINBRT-1; /* bogus value */ |
96 |
< |
li++; /* avoid li==0 */ |
89 |
> |
li = cd->clfb[RED]*cmon[RED] + |
90 |
> |
cd->clfb[GRN]*cmon[GRN] + |
91 |
> |
cd->clfb[BLU]*cmon[BLU] ; |
92 |
> |
if (li >= 0xff00) li = 255; |
93 |
> |
else li >>= 8; |
94 |
> |
if (li <= 0) { |
95 |
> |
bi = TM_NOBRT; /* bogus value */ |
96 |
> |
li = 1; /* avoid li==0 */ |
97 |
> |
} else { |
98 |
> |
bi = BRT2SCALE(cmon[EXP]-COLXS) + |
99 |
> |
logi[li] + cd->inpsfb; |
100 |
|
} |
101 |
|
ls[i] = bi; |
102 |
|
if (cs == TM_NOCHROM) /* no color? */ |
103 |
|
continue; |
104 |
|
/* mesopic adj. */ |
105 |
< |
if (tmTop->flags & TM_F_MESOPIC && bi < BMESUPPER) { |
106 |
< |
register int pf, sli = normscot(cmon); |
107 |
< |
if (bi < BMESLOWER) |
105 |
> |
if (tms->flags & TM_F_MESOPIC && bi < BMESUPPER) { |
106 |
> |
int pf, sli = normscot(cmon); |
107 |
> |
if (bi < BMESLOWER) { |
108 |
|
cmon[RED] = cmon[GRN] = cmon[BLU] = sli; |
109 |
< |
else { |
110 |
< |
if (tmTop->flags & TM_F_BW) |
109 |
> |
} else { |
110 |
> |
if (tms->flags & TM_F_BW) |
111 |
|
cmon[RED] = cmon[GRN] = cmon[BLU] = li; |
112 |
< |
pf = photofact[bi-BMESLOWER]; |
112 |
> |
pf = tmMesofact[bi-BMESLOWER]; |
113 |
|
sli *= 256 - pf; |
114 |
< |
cmon[RED] = ( sli + pf*cmon[RED] ) >> 8; |
115 |
< |
cmon[GRN] = ( sli + pf*cmon[GRN] ) >> 8; |
116 |
< |
cmon[BLU] = ( sli + pf*cmon[BLU] ) >> 8; |
114 |
> |
for (j = 3; j--; ) { |
115 |
> |
cmon[j] = sli + pf*cmon[j]; |
116 |
> |
if (cmon[j] <= 0) cmon[j] = 0; |
117 |
> |
else cmon[j] >>= 8; |
118 |
> |
} |
119 |
|
} |
120 |
< |
} else if (tmTop->flags & TM_F_BW) { |
120 |
> |
} else if (tms->flags & TM_F_BW) { |
121 |
|
cmon[RED] = cmon[GRN] = cmon[BLU] = li; |
122 |
+ |
} else { |
123 |
+ |
for (j = 3; j--; ) |
124 |
+ |
if (cmon[j] < 0) cmon[j] = 0; |
125 |
|
} |
126 |
< |
bi = ( (int4)TM_GAMTSZ*tmTop->clfb[RED]*cmon[RED]/li ) >> 8; |
127 |
< |
cs[3*i ] = bi>=TM_GAMTSZ ? 255 : tmTop->gamb[bi]; |
128 |
< |
bi = ( (int4)TM_GAMTSZ*tmTop->clfb[GRN]*cmon[GRN]/li ) >> 8; |
129 |
< |
cs[3*i+1] = bi>=TM_GAMTSZ ? 255 : tmTop->gamb[bi]; |
130 |
< |
bi = ( (int4)TM_GAMTSZ*tmTop->clfb[BLU]*cmon[BLU]/li ) >> 8; |
131 |
< |
cs[3*i+2] = bi>=TM_GAMTSZ ? 255 : tmTop->gamb[bi]; |
126 |
> |
bi = ( (int32)GAMTSZ*cd->clfb[RED]*cmon[RED]/li ) >> 8; |
127 |
> |
cs[3*i ] = bi>=GAMTSZ ? 255 : cd->gamb[bi]; |
128 |
> |
bi = ( (int32)GAMTSZ*cd->clfb[GRN]*cmon[GRN]/li ) >> 8; |
129 |
> |
cs[3*i+1] = bi>=GAMTSZ ? 255 : cd->gamb[bi]; |
130 |
> |
bi = ( (int32)GAMTSZ*cd->clfb[BLU]*cmon[BLU]/li ) >> 8; |
131 |
> |
cs[3*i+2] = bi>=GAMTSZ ? 255 : cd->gamb[bi]; |
132 |
|
} |
133 |
|
returnOK; |
134 |
|
} |
148 |
|
|
149 |
|
|
150 |
|
static int |
151 |
< |
headline(s, rh) /* grok a header line */ |
152 |
< |
register char *s; |
153 |
< |
register struct radhead *rh; |
151 |
> |
headline( /* grok a header line */ |
152 |
> |
register char *s, |
153 |
> |
void *vrh |
154 |
> |
) |
155 |
|
{ |
156 |
|
char fmt[32]; |
157 |
+ |
register struct radhead *rh = vrh; |
158 |
|
|
159 |
|
if (formatval(fmt, s)) { |
160 |
|
if (!strcmp(fmt, COLRFMT)) |
163 |
|
rh->format = FMTCIE; |
164 |
|
else |
165 |
|
rh->format = FMTBAD; |
166 |
< |
return; |
166 |
> |
return(0); |
167 |
|
} |
168 |
|
if (isexpos(s)) { |
169 |
|
rh->expos *= exposval(s); |
170 |
< |
return; |
170 |
> |
return(0); |
171 |
|
} |
172 |
|
if (isprims(s)) { |
173 |
|
primsval(rh->mypri, s); |
174 |
|
rh->primp = rh->mypri; |
175 |
< |
return; |
175 |
> |
return(0); |
176 |
|
} |
177 |
+ |
return(0); |
178 |
|
} |
179 |
|
|
180 |
|
|
181 |
|
int |
182 |
< |
tmLoadPicture(lpp, cpp, xp, yp, fname, fp) /* convert Radiance picture */ |
183 |
< |
TMbright **lpp; |
184 |
< |
BYTE **cpp; |
185 |
< |
int *xp, *yp; |
186 |
< |
char *fname; |
187 |
< |
FILE *fp; |
182 |
> |
tmLoadPicture( /* convert Radiance picture */ |
183 |
> |
TMstruct *tms, |
184 |
> |
TMbright **lpp, |
185 |
> |
BYTE **cpp, |
186 |
> |
int *xp, |
187 |
> |
int *yp, |
188 |
> |
char *fname, |
189 |
> |
FILE *fp |
190 |
> |
) |
191 |
|
{ |
192 |
|
char *funcName = fname==NULL ? "tmLoadPicture" : fname; |
193 |
|
FILE *inpf; |
196 |
|
COLR *scanin = NULL; |
197 |
|
int i; |
198 |
|
/* check arguments */ |
199 |
< |
if (tmTop == NULL) |
199 |
> |
if (tms == NULL) |
200 |
|
returnErr(TM_E_TMINVAL); |
201 |
< |
if (lpp == NULL | xp == NULL | yp == NULL | |
202 |
< |
(fname == NULL & fp == TM_GETFILE)) |
201 |
> |
if ((lpp == NULL) | (xp == NULL) | (yp == NULL) | |
202 |
> |
((fname == NULL) & (fp == TM_GETFILE))) |
203 |
|
returnErr(TM_E_ILLEGAL); |
204 |
|
*xp = *yp = 0; /* error precaution */ |
205 |
< |
if ((inpf = fp) == TM_GETFILE && (inpf = fopen(fname, "r")) == NULL) |
205 |
> |
if ((inpf = fp) == TM_GETFILE && (inpf = fopen(fname, "rb")) == NULL) |
206 |
|
returnErr(TM_E_BADFILE); |
207 |
+ |
*lpp = NULL; |
208 |
+ |
if (cpp != TM_NOCHROMP) *cpp = NULL; |
209 |
|
info = rhdefault; /* get our header */ |
210 |
< |
getheader(inpf, headline, (char *)&info); |
211 |
< |
if (info.format == FMTBAD | info.expos <= 0. || |
210 |
> |
getheader(inpf, headline, &info); |
211 |
> |
if ((info.format == FMTBAD) | (info.expos <= 0.) || |
212 |
|
fgetresolu(xp, yp, inpf) < 0) { |
213 |
|
err = TM_E_BADFILE; goto done; |
214 |
|
} |
219 |
|
else if (info.format == FMTCIE) |
220 |
|
info.primp = TM_XYZPRIM; |
221 |
|
/* prepare library */ |
222 |
< |
if ((err = tmSetSpace(info.primp, 1./info.expos)) != TM_E_OK) |
222 |
> |
if ((err = tmSetSpace(tms, info.primp, 1./info.expos, NULL)) != TM_E_OK) |
223 |
|
goto done; |
224 |
|
err = TM_E_NOMEM; /* allocate arrays */ |
225 |
|
*lpp = (TMbright *)malloc(sizeof(TMbright) * *xp * *yp); |
238 |
|
if (freadcolrs(scanin, *xp, inpf) < 0) { |
239 |
|
err = TM_E_BADFILE; break; |
240 |
|
} |
241 |
< |
err = tmCvColrs(*lpp + (i * *xp), |
241 |
> |
err = tmCvColrs(tms, *lpp + (i * *xp), |
242 |
|
cpp==TM_NOCHROMP ? TM_NOCHROM : *cpp + (i * 3 * *xp), |
243 |
|
scanin, *xp); |
244 |
|
if (err != TM_E_OK) |
248 |
|
if (fp == NULL) |
249 |
|
fclose(inpf); |
250 |
|
if (scanin != NULL) |
251 |
< |
free((char *)scanin); |
252 |
< |
if (err != TM_E_OK) |
251 |
> |
free((MEM_PTR)scanin); |
252 |
> |
if (err != TM_E_OK) { |
253 |
> |
if (*lpp != NULL) |
254 |
> |
free((MEM_PTR)*lpp); |
255 |
> |
if (cpp != TM_NOCHROMP && *cpp != NULL) |
256 |
> |
free((MEM_PTR)*cpp); |
257 |
|
returnErr(err); |
258 |
+ |
} |
259 |
|
returnOK; |
260 |
|
} |
261 |
|
|
262 |
|
|
263 |
< |
int /* run pcond to map picture */ |
263 |
> |
#ifdef PCOND |
264 |
> |
static int /* run pcond to map picture */ |
265 |
|
dopcond(psp, xp, yp, flags, monpri, gamval, Lddyn, Ldmax, fname) |
266 |
|
BYTE **psp; |
267 |
|
int *xp, *yp; |
271 |
|
char *fname; |
272 |
|
{ |
273 |
|
char *funcName = fname; |
274 |
< |
char cmdbuf[512]; |
274 |
> |
TMstruct *tms = NULL; |
275 |
> |
char cmdbuf[1024]; |
276 |
|
FILE *infp; |
277 |
|
register COLR *scan; |
278 |
|
register BYTE *rp; |
282 |
|
if (setcolrcor(pow, 1./gamval) < 0) |
283 |
|
returnErr(TM_E_NOMEM); |
284 |
|
/* create command */ |
285 |
< |
strcpy(cmdbuf, "pcond "); |
285 |
> |
strcpy(cmdbuf, PCOND); |
286 |
|
if (flags & TM_F_HCONTR) |
287 |
< |
strcat(cmdbuf, "-s "); |
287 |
> |
strcat(cmdbuf, " -s"); |
288 |
|
if (flags & TM_F_MESOPIC) |
289 |
< |
strcat(cmdbuf, "-c "); |
289 |
> |
strcat(cmdbuf, " -c"); |
290 |
|
if (flags & TM_F_LINEAR) |
291 |
< |
strcat(cmdbuf, "-l "); |
291 |
> |
strcat(cmdbuf, " -l"); |
292 |
|
if (flags & TM_F_ACUITY) |
293 |
< |
strcat(cmdbuf, "-a "); |
293 |
> |
strcat(cmdbuf, " -a"); |
294 |
|
if (flags & TM_F_VEIL) |
295 |
< |
strcat(cmdbuf, "-v "); |
295 |
> |
strcat(cmdbuf, " -v"); |
296 |
|
if (flags & TM_F_CWEIGHT) |
297 |
< |
strcat(cmdbuf, "-w "); |
298 |
< |
sprintf(cmdbuf+strlen(cmdbuf), |
299 |
< |
"-p %f %f %f %f %f %f %f %f -d %f -u %f %s", |
300 |
< |
monpri[RED][CIEX], monpri[RED][CIEY], |
301 |
< |
monpri[GRN][CIEX], monpri[GRN][CIEY], |
302 |
< |
monpri[BLU][CIEX], monpri[BLU][CIEY], |
303 |
< |
monpri[WHT][CIEX], monpri[WHT][CIEY], |
304 |
< |
Lddyn, Ldmax, fname); |
297 |
> |
strcat(cmdbuf, " -w"); |
298 |
> |
if (monpri != stdprims) |
299 |
> |
sprintf(cmdbuf+strlen(cmdbuf), " -p %f %f %f %f %f %f %f %f", |
300 |
> |
monpri[RED][CIEX], monpri[RED][CIEY], |
301 |
> |
monpri[GRN][CIEX], monpri[GRN][CIEY], |
302 |
> |
monpri[BLU][CIEX], monpri[BLU][CIEY], |
303 |
> |
monpri[WHT][CIEX], monpri[WHT][CIEY]); |
304 |
> |
sprintf(cmdbuf+strlen(cmdbuf), " -d %f -u %f %s", Lddyn, Ldmax, fname); |
305 |
|
/* start pcond */ |
306 |
|
if ((infp = popen(cmdbuf, "r")) == NULL) |
307 |
|
returnErr(TM_E_BADFILE); |
312 |
|
returnErr(TM_E_BADFILE); |
313 |
|
} |
314 |
|
/* allocate arrays */ |
315 |
+ |
scan = (COLR *)malloc(sizeof(COLR) * *xp); |
316 |
|
if (flags & TM_F_BW) |
317 |
|
rp = (BYTE *)malloc(sizeof(BYTE) * *xp * *yp); |
318 |
|
else |
319 |
|
rp = (BYTE *)malloc(3*sizeof(BYTE) * *xp * *yp); |
320 |
< |
scan = (COLR *)malloc(sizeof(COLR) * *xp); |
270 |
< |
if ((*psp = rp) == NULL | scan == NULL) { |
320 |
> |
if (((*psp = rp) == NULL) | (scan == NULL)) { |
321 |
|
pclose(infp); |
322 |
|
returnErr(TM_E_NOMEM); |
323 |
|
} |
325 |
|
for (y = 0; y < *yp; y++) { |
326 |
|
if (freadcolrs(scan, *xp, infp) < 0) { |
327 |
|
pclose(infp); |
328 |
+ |
free((MEM_PTR)scan); |
329 |
+ |
free((MEM_PTR)*psp); |
330 |
+ |
*psp = NULL; |
331 |
|
returnErr(TM_E_BADFILE); |
332 |
|
} |
333 |
|
colrs_gambs(scan, *xp); |
341 |
|
*rp++ = scan[x][BLU]; |
342 |
|
} |
343 |
|
} |
344 |
< |
free((char *)scan); |
344 |
> |
free((MEM_PTR)scan); |
345 |
|
pclose(infp); |
346 |
|
returnOK; |
347 |
|
} |
348 |
+ |
#endif |
349 |
|
|
350 |
|
|
351 |
|
int /* map a Radiance picture */ |
359 |
|
FILE *fp; |
360 |
|
{ |
361 |
|
char *funcName = fname==NULL ? "tmMapPicture" : fname; |
362 |
< |
FILE *inpf; |
362 |
> |
TMstruct *tms; |
363 |
|
BYTE *cp; |
364 |
|
TMbright *lp; |
365 |
|
int err; |
366 |
|
/* check arguments */ |
367 |
< |
if (psp == NULL | xp == NULL | yp == NULL | monpri == NULL | |
368 |
< |
(fname == NULL & fp == TM_GETFILE)) |
367 |
> |
if ((psp == NULL) | (xp == NULL) | (yp == NULL) | (monpri == NULL) | |
368 |
> |
((fname == NULL) & (fp == TM_GETFILE))) |
369 |
|
returnErr(TM_E_ILLEGAL); |
370 |
|
/* set defaults */ |
371 |
|
if (gamval < MINGAM) gamval = DEFGAM; |
372 |
|
if (Lddyn < MINLDDYN) Lddyn = DEFLDDYN; |
373 |
|
if (Ldmax < MINLDMAX) Ldmax = DEFLDMAX; |
374 |
|
if (flags & TM_F_BW) monpri = stdprims; |
375 |
+ |
#ifdef PCOND |
376 |
|
/* check for pcond run */ |
377 |
|
if (fp == TM_GETFILE && flags & TM_F_UNIMPL) |
378 |
|
return( dopcond(psp, xp, yp, flags, |
379 |
|
monpri, gamval, Lddyn, Ldmax, fname) ); |
380 |
+ |
#endif |
381 |
|
/* initialize tone mapping */ |
382 |
< |
if (tmInit(flags, monpri, gamval) == NULL) |
382 |
> |
if ((tms = tmInit(flags, monpri, gamval)) == NULL) |
383 |
|
returnErr(TM_E_NOMEM); |
384 |
|
/* load & convert picture */ |
385 |
< |
err = tmLoadPicture(&lp, (flags&TM_F_BW) ? TM_NOCHROMP : &cp, |
385 |
> |
err = tmLoadPicture(tms, &lp, (flags&TM_F_BW) ? TM_NOCHROMP : &cp, |
386 |
|
xp, yp, fname, fp); |
387 |
|
if (err != TM_E_OK) { |
388 |
< |
tmDone(NULL); |
388 |
> |
tmDone(tms); |
389 |
|
return(err); |
390 |
|
} |
391 |
|
/* allocate space for result */ |
392 |
|
if (flags & TM_F_BW) { |
393 |
|
*psp = (BYTE *)malloc(sizeof(BYTE) * *xp * *yp); |
394 |
< |
if (*psp == NULL) |
394 |
> |
if (*psp == NULL) { |
395 |
> |
free((MEM_PTR)lp); |
396 |
> |
tmDone(tms); |
397 |
|
returnErr(TM_E_NOMEM); |
398 |
+ |
} |
399 |
|
cp = TM_NOCHROM; |
400 |
|
} else |
401 |
|
*psp = cp; |
402 |
|
/* compute color mapping */ |
403 |
< |
err = tmAddHisto(lp, *xp * *yp, 1); |
403 |
> |
err = tmAddHisto(tms, lp, *xp * *yp, 1); |
404 |
|
if (err != TM_E_OK) |
405 |
|
goto done; |
406 |
< |
err = tmComputeMapping(gamval, Lddyn, Ldmax); |
406 |
> |
err = tmComputeMapping(tms, gamval, Lddyn, Ldmax); |
407 |
|
if (err != TM_E_OK) |
408 |
|
goto done; |
409 |
|
/* map colors */ |
410 |
< |
err = tmMapPixels(*psp, lp, cp, *xp * *yp); |
410 |
> |
err = tmMapPixels(tms, *psp, lp, cp, *xp * *yp); |
411 |
|
|
412 |
|
done: /* clean up */ |
413 |
< |
free((char *)lp); |
414 |
< |
tmDone(NULL); |
413 |
> |
free((MEM_PTR)lp); |
414 |
> |
tmDone(tms); |
415 |
|
if (err != TM_E_OK) { /* free memory on error */ |
416 |
< |
free((char *)*psp); |
416 |
> |
free((MEM_PTR)*psp); |
417 |
|
*psp = NULL; |
418 |
|
returnErr(err); |
419 |
|
} |
420 |
|
returnOK; |
421 |
+ |
} |
422 |
+ |
|
423 |
+ |
|
424 |
+ |
static void |
425 |
+ |
colrNewSpace(tms) /* color space changed for tone mapping */ |
426 |
+ |
register TMstruct *tms; |
427 |
+ |
{ |
428 |
+ |
register COLRDATA *cd; |
429 |
+ |
double d; |
430 |
+ |
int i, j; |
431 |
+ |
|
432 |
+ |
cd = (COLRDATA *)tms->pd[colrReg]; |
433 |
+ |
for (i = 3; i--; ) |
434 |
+ |
cd->clfb[i] = 0x100*tms->clf[i] + .5; |
435 |
+ |
d = TM_BRTSCALE*log(tms->inpsf); |
436 |
+ |
cd->inpsfb = d<0. ? d-.5 : d+.5; |
437 |
+ |
for (i = 3; i--; ) |
438 |
+ |
for (j = 3; j--; ) { |
439 |
+ |
d = tms->cmat[i][j] / tms->inpsf; |
440 |
+ |
cd->cmatb[i][j] = 0x10000*d + (d<0. ? -.5 : .5); |
441 |
+ |
} |
442 |
+ |
} |
443 |
+ |
|
444 |
+ |
|
445 |
+ |
static MEM_PTR |
446 |
+ |
colrInit(tms) /* initialize private data for tone mapping */ |
447 |
+ |
register TMstruct *tms; |
448 |
+ |
{ |
449 |
+ |
register COLRDATA *cd; |
450 |
+ |
register int i; |
451 |
+ |
/* allocate our data */ |
452 |
+ |
cd = (COLRDATA *)malloc(sizeof(COLRDATA)); |
453 |
+ |
if (cd == NULL) |
454 |
+ |
return(NULL); |
455 |
+ |
tms->pd[colrReg] = (MEM_PTR)cd; |
456 |
+ |
/* compute gamma table */ |
457 |
+ |
for (i = GAMTSZ; i--; ) |
458 |
+ |
cd->gamb[i] = 256.*pow((i+.5)/GAMTSZ, 1./tms->mongam); |
459 |
+ |
/* compute color and scale factors */ |
460 |
+ |
colrNewSpace(tms); |
461 |
+ |
return((MEM_PTR)cd); |
462 |
|
} |