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); |
93 |
|
ls[i] = bi; |
94 |
|
if (cs == TM_NOCHROM) /* no color? */ |
95 |
|
continue; |
96 |
+ |
if (tmTop->flags & TM_F_BW) |
97 |
+ |
cmon[RED] = cmon[GRN] = cmon[BLU] = li; |
98 |
|
/* mesopic adj. */ |
99 |
|
if (tmTop->flags & TM_F_MESOPIC && bi < BMESUPPER) { |
100 |
|
register int pf, sli = normscot(cmon); |
101 |
|
if (bi < BMESLOWER) |
102 |
|
cmon[RED] = cmon[GRN] = cmon[BLU] = sli; |
103 |
|
else { |
102 |
– |
if (tmTop->flags & TM_F_BW) |
103 |
– |
cmon[RED] = cmon[GRN] = cmon[BLU] = li; |
104 |
|
pf = photofact[bi-BMESLOWER]; |
105 |
|
sli *= 256 - pf; |
106 |
|
cmon[RED] = ( sli + pf*cmon[RED] ) >> 8; |
107 |
|
cmon[GRN] = ( sli + pf*cmon[GRN] ) >> 8; |
108 |
|
cmon[BLU] = ( sli + pf*cmon[BLU] ) >> 8; |
109 |
|
} |
110 |
– |
} else if (tmTop->flags & TM_F_BW) { |
111 |
– |
cmon[RED] = cmon[GRN] = cmon[BLU] = li; |
110 |
|
} |
111 |
|
bi = ( (int4)GAMTSZ*cd->clfb[RED]*cmon[RED]/li ) >> 8; |
112 |
|
cs[3*i ] = bi>=GAMTSZ ? 255 : cd->gamb[bi]; |
146 |
|
rh->format = FMTCIE; |
147 |
|
else |
148 |
|
rh->format = FMTBAD; |
149 |
< |
return; |
149 |
> |
return(0); |
150 |
|
} |
151 |
|
if (isexpos(s)) { |
152 |
|
rh->expos *= exposval(s); |
153 |
< |
return; |
153 |
> |
return(0); |
154 |
|
} |
155 |
|
if (isprims(s)) { |
156 |
|
primsval(rh->mypri, s); |
157 |
|
rh->primp = rh->mypri; |
158 |
< |
return; |
158 |
> |
return(0); |
159 |
|
} |
160 |
+ |
return(0); |
161 |
|
} |
162 |
|
|
163 |
|
|
184 |
|
*xp = *yp = 0; /* error precaution */ |
185 |
|
if ((inpf = fp) == TM_GETFILE && (inpf = fopen(fname, "r")) == NULL) |
186 |
|
returnErr(TM_E_BADFILE); |
187 |
+ |
*lpp = NULL; |
188 |
+ |
if (cpp != TM_NOCHROMP) *cpp = NULL; |
189 |
|
info = rhdefault; /* get our header */ |
190 |
< |
getheader(inpf, headline, (char *)&info); |
190 |
> |
getheader(inpf, headline, (MEM_PTR)&info); |
191 |
|
if (info.format == FMTBAD | info.expos <= 0. || |
192 |
|
fgetresolu(xp, yp, inpf) < 0) { |
193 |
|
err = TM_E_BADFILE; goto done; |
228 |
|
if (fp == NULL) |
229 |
|
fclose(inpf); |
230 |
|
if (scanin != NULL) |
231 |
< |
free((char *)scanin); |
232 |
< |
if (err != TM_E_OK) |
231 |
> |
free((MEM_PTR)scanin); |
232 |
> |
if (err != TM_E_OK) { |
233 |
> |
if (*lpp != NULL) |
234 |
> |
free((MEM_PTR)*lpp); |
235 |
> |
if (cpp != TM_NOCHROMP && *cpp != NULL) |
236 |
> |
free((MEM_PTR)*cpp); |
237 |
|
returnErr(err); |
238 |
+ |
} |
239 |
|
returnOK; |
240 |
|
} |
241 |
|
|
303 |
|
for (y = 0; y < *yp; y++) { |
304 |
|
if (freadcolrs(scan, *xp, infp) < 0) { |
305 |
|
pclose(infp); |
306 |
< |
free((char *)scan); |
307 |
< |
free((char *)*psp); |
306 |
> |
free((MEM_PTR)scan); |
307 |
> |
free((MEM_PTR)*psp); |
308 |
|
*psp = NULL; |
309 |
|
returnErr(TM_E_BADFILE); |
310 |
|
} |
319 |
|
*rp++ = scan[x][BLU]; |
320 |
|
} |
321 |
|
} |
322 |
< |
free((char *)scan); |
322 |
> |
free((MEM_PTR)scan); |
323 |
|
pclose(infp); |
324 |
|
returnOK; |
325 |
|
} |
336 |
|
FILE *fp; |
337 |
|
{ |
338 |
|
char *funcName = fname==NULL ? "tmMapPicture" : fname; |
333 |
– |
FILE *inpf; |
339 |
|
BYTE *cp; |
340 |
|
TMbright *lp; |
341 |
|
int err; |
366 |
|
if (flags & TM_F_BW) { |
367 |
|
*psp = (BYTE *)malloc(sizeof(BYTE) * *xp * *yp); |
368 |
|
if (*psp == NULL) { |
369 |
< |
free((char *)lp); |
369 |
> |
free((MEM_PTR)lp); |
370 |
|
tmDone(NULL); |
371 |
|
returnErr(TM_E_NOMEM); |
372 |
|
} |
384 |
|
err = tmMapPixels(*psp, lp, cp, *xp * *yp); |
385 |
|
|
386 |
|
done: /* clean up */ |
387 |
< |
free((char *)lp); |
387 |
> |
free((MEM_PTR)lp); |
388 |
|
tmDone(NULL); |
389 |
|
if (err != TM_E_OK) { /* free memory on error */ |
390 |
< |
free((char *)*psp); |
390 |
> |
free((MEM_PTR)*psp); |
391 |
|
*psp = NULL; |
392 |
|
returnErr(err); |
393 |
|
} |