39 |
|
|
40 |
|
|
41 |
|
int |
42 |
< |
tmCvColrs(ls, cs, scan, len) /* tone map RGBE/XYZE colors */ |
42 |
> |
tmCvColrs(ls, cs, scan, len) /* convert RGBE/XYZE colors */ |
43 |
|
TMbright *ls; |
44 |
|
BYTE *cs; |
45 |
|
COLR *scan; |
63 |
|
colr_color(newscan[i], scan[i]); |
64 |
|
return(tmCvColors(ls, cs, newscan, len)); |
65 |
|
} |
66 |
< |
if (colrReg == -1) { /* build tables if necessary */ |
66 |
> |
if (colrReg < 0) { /* build tables if necessary */ |
67 |
|
colrReg = tmRegPkg(&colrPkg); |
68 |
|
if (colrReg < 0) |
69 |
|
returnErr(TM_E_CODERR1); |
148 |
|
rh->format = FMTCIE; |
149 |
|
else |
150 |
|
rh->format = FMTBAD; |
151 |
< |
return; |
151 |
> |
return(0); |
152 |
|
} |
153 |
|
if (isexpos(s)) { |
154 |
|
rh->expos *= exposval(s); |
155 |
< |
return; |
155 |
> |
return(0); |
156 |
|
} |
157 |
|
if (isprims(s)) { |
158 |
|
primsval(rh->mypri, s); |
159 |
|
rh->primp = rh->mypri; |
160 |
< |
return; |
160 |
> |
return(0); |
161 |
|
} |
162 |
+ |
return(0); |
163 |
|
} |
164 |
|
|
165 |
|
|
186 |
|
*xp = *yp = 0; /* error precaution */ |
187 |
|
if ((inpf = fp) == TM_GETFILE && (inpf = fopen(fname, "r")) == NULL) |
188 |
|
returnErr(TM_E_BADFILE); |
189 |
+ |
*lpp = NULL; |
190 |
+ |
if (cpp != TM_NOCHROMP) *cpp = NULL; |
191 |
|
info = rhdefault; /* get our header */ |
192 |
< |
getheader(inpf, headline, (char *)&info); |
192 |
> |
getheader(inpf, headline, (MEM_PTR)&info); |
193 |
|
if (info.format == FMTBAD | info.expos <= 0. || |
194 |
|
fgetresolu(xp, yp, inpf) < 0) { |
195 |
|
err = TM_E_BADFILE; goto done; |
230 |
|
if (fp == NULL) |
231 |
|
fclose(inpf); |
232 |
|
if (scanin != NULL) |
233 |
< |
free((char *)scanin); |
234 |
< |
if (err != TM_E_OK) |
233 |
> |
free((MEM_PTR)scanin); |
234 |
> |
if (err != TM_E_OK) { |
235 |
> |
if (*lpp != NULL) |
236 |
> |
free((MEM_PTR)*lpp); |
237 |
> |
if (cpp != TM_NOCHROMP && *cpp != NULL) |
238 |
> |
free((MEM_PTR)*cpp); |
239 |
|
returnErr(err); |
240 |
+ |
} |
241 |
|
returnOK; |
242 |
|
} |
243 |
|
|
244 |
|
|
245 |
+ |
#ifdef PCOND |
246 |
|
int /* run pcond to map picture */ |
247 |
|
dopcond(psp, xp, yp, flags, monpri, gamval, Lddyn, Ldmax, fname) |
248 |
|
BYTE **psp; |
263 |
|
if (setcolrcor(pow, 1./gamval) < 0) |
264 |
|
returnErr(TM_E_NOMEM); |
265 |
|
/* create command */ |
266 |
< |
strcpy(cmdbuf, "pcond "); |
266 |
> |
strcpy(cmdbuf, PCOND); |
267 |
|
if (flags & TM_F_HCONTR) |
268 |
< |
strcat(cmdbuf, "-s "); |
268 |
> |
strcat(cmdbuf, " -s"); |
269 |
|
if (flags & TM_F_MESOPIC) |
270 |
< |
strcat(cmdbuf, "-c "); |
270 |
> |
strcat(cmdbuf, " -c"); |
271 |
|
if (flags & TM_F_LINEAR) |
272 |
< |
strcat(cmdbuf, "-l "); |
272 |
> |
strcat(cmdbuf, " -l"); |
273 |
|
if (flags & TM_F_ACUITY) |
274 |
< |
strcat(cmdbuf, "-a "); |
274 |
> |
strcat(cmdbuf, " -a"); |
275 |
|
if (flags & TM_F_VEIL) |
276 |
< |
strcat(cmdbuf, "-v "); |
276 |
> |
strcat(cmdbuf, " -v"); |
277 |
|
if (flags & TM_F_CWEIGHT) |
278 |
< |
strcat(cmdbuf, "-w "); |
279 |
< |
sprintf(cmdbuf+strlen(cmdbuf), |
280 |
< |
"-p %f %f %f %f %f %f %f %f -d %f -u %f %s", |
281 |
< |
monpri[RED][CIEX], monpri[RED][CIEY], |
282 |
< |
monpri[GRN][CIEX], monpri[GRN][CIEY], |
283 |
< |
monpri[BLU][CIEX], monpri[BLU][CIEY], |
284 |
< |
monpri[WHT][CIEX], monpri[WHT][CIEY], |
285 |
< |
Lddyn, Ldmax, fname); |
278 |
> |
strcat(cmdbuf, " -w"); |
279 |
> |
if (monpri != stdprims) |
280 |
> |
sprintf(cmdbuf+strlen(cmdbuf), " -p %f %f %f %f %f %f %f %f", |
281 |
> |
monpri[RED][CIEX], monpri[RED][CIEY], |
282 |
> |
monpri[GRN][CIEX], monpri[GRN][CIEY], |
283 |
> |
monpri[BLU][CIEX], monpri[BLU][CIEY], |
284 |
> |
monpri[WHT][CIEX], monpri[WHT][CIEY]); |
285 |
> |
sprintf(cmdbuf+strlen(cmdbuf), " -d %f -u %f %s", Lddyn, Ldmax, fname); |
286 |
|
/* start pcond */ |
287 |
|
if ((infp = popen(cmdbuf, "r")) == NULL) |
288 |
|
returnErr(TM_E_BADFILE); |
306 |
|
for (y = 0; y < *yp; y++) { |
307 |
|
if (freadcolrs(scan, *xp, infp) < 0) { |
308 |
|
pclose(infp); |
309 |
< |
free((char *)scan); |
310 |
< |
free((char *)*psp); |
309 |
> |
free((MEM_PTR)scan); |
310 |
> |
free((MEM_PTR)*psp); |
311 |
|
*psp = NULL; |
312 |
|
returnErr(TM_E_BADFILE); |
313 |
|
} |
322 |
|
*rp++ = scan[x][BLU]; |
323 |
|
} |
324 |
|
} |
325 |
< |
free((char *)scan); |
325 |
> |
free((MEM_PTR)scan); |
326 |
|
pclose(infp); |
327 |
|
returnOK; |
328 |
|
} |
329 |
+ |
#endif |
330 |
|
|
331 |
|
|
332 |
|
int /* map a Radiance picture */ |
340 |
|
FILE *fp; |
341 |
|
{ |
342 |
|
char *funcName = fname==NULL ? "tmMapPicture" : fname; |
333 |
– |
FILE *inpf; |
343 |
|
BYTE *cp; |
344 |
|
TMbright *lp; |
345 |
|
int err; |
352 |
|
if (Lddyn < MINLDDYN) Lddyn = DEFLDDYN; |
353 |
|
if (Ldmax < MINLDMAX) Ldmax = DEFLDMAX; |
354 |
|
if (flags & TM_F_BW) monpri = stdprims; |
355 |
+ |
#ifdef PCOND |
356 |
|
/* check for pcond run */ |
357 |
|
if (fp == TM_GETFILE && flags & TM_F_UNIMPL) |
358 |
|
return( dopcond(psp, xp, yp, flags, |
359 |
|
monpri, gamval, Lddyn, Ldmax, fname) ); |
360 |
+ |
#endif |
361 |
|
/* initialize tone mapping */ |
362 |
|
if (tmInit(flags, monpri, gamval) == NULL) |
363 |
|
returnErr(TM_E_NOMEM); |
372 |
|
if (flags & TM_F_BW) { |
373 |
|
*psp = (BYTE *)malloc(sizeof(BYTE) * *xp * *yp); |
374 |
|
if (*psp == NULL) { |
375 |
< |
free((char *)lp); |
375 |
> |
free((MEM_PTR)lp); |
376 |
|
tmDone(NULL); |
377 |
|
returnErr(TM_E_NOMEM); |
378 |
|
} |
390 |
|
err = tmMapPixels(*psp, lp, cp, *xp * *yp); |
391 |
|
|
392 |
|
done: /* clean up */ |
393 |
< |
free((char *)lp); |
393 |
> |
free((MEM_PTR)lp); |
394 |
|
tmDone(NULL); |
395 |
|
if (err != TM_E_OK) { /* free memory on error */ |
396 |
< |
free((char *)*psp); |
396 |
> |
free((MEM_PTR)*psp); |
397 |
|
*psp = NULL; |
398 |
|
returnErr(err); |
399 |
|
} |