1 |
< |
/* Copyright (c) 1997 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1998 Silicon Graphics, Inc. */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
< |
static char SCCSid[] = "$SunId$ LBL"; |
4 |
> |
static char SCCSid[] = "$SunId$ SGI"; |
5 |
|
#endif |
6 |
|
|
7 |
|
/* |
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; |
52 |
|
|
53 |
|
if (tmTop == NULL) |
54 |
|
returnErr(TM_E_TMINVAL); |
55 |
< |
if (ls == NULL | scan == NULL | len <= 0) |
55 |
> |
if (ls == NULL | scan == NULL | len < 0) |
56 |
|
returnErr(TM_E_ILLEGAL); |
57 |
|
if (tmNeedMatrix(tmTop)) { /* need floating point */ |
58 |
|
register COLOR *newscan; |
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 |
|
|
305 |
|
for (y = 0; y < *yp; y++) { |
306 |
|
if (freadcolrs(scan, *xp, infp) < 0) { |
307 |
|
pclose(infp); |
308 |
< |
free((char *)scan); |
309 |
< |
free((char *)*psp); |
308 |
> |
free((MEM_PTR)scan); |
309 |
> |
free((MEM_PTR)*psp); |
310 |
|
*psp = NULL; |
311 |
|
returnErr(TM_E_BADFILE); |
312 |
|
} |
321 |
|
*rp++ = scan[x][BLU]; |
322 |
|
} |
323 |
|
} |
324 |
< |
free((char *)scan); |
324 |
> |
free((MEM_PTR)scan); |
325 |
|
pclose(infp); |
326 |
|
returnOK; |
327 |
|
} |
338 |
|
FILE *fp; |
339 |
|
{ |
340 |
|
char *funcName = fname==NULL ? "tmMapPicture" : fname; |
333 |
– |
FILE *inpf; |
341 |
|
BYTE *cp; |
342 |
|
TMbright *lp; |
343 |
|
int err; |
368 |
|
if (flags & TM_F_BW) { |
369 |
|
*psp = (BYTE *)malloc(sizeof(BYTE) * *xp * *yp); |
370 |
|
if (*psp == NULL) { |
371 |
< |
free((char *)lp); |
371 |
> |
free((MEM_PTR)lp); |
372 |
|
tmDone(NULL); |
373 |
|
returnErr(TM_E_NOMEM); |
374 |
|
} |
386 |
|
err = tmMapPixels(*psp, lp, cp, *xp * *yp); |
387 |
|
|
388 |
|
done: /* clean up */ |
389 |
< |
free((char *)lp); |
389 |
> |
free((MEM_PTR)lp); |
390 |
|
tmDone(NULL); |
391 |
|
if (err != TM_E_OK) { /* free memory on error */ |
392 |
< |
free((char *)*psp); |
392 |
> |
free((MEM_PTR)*psp); |
393 |
|
*psp = NULL; |
394 |
|
returnErr(err); |
395 |
|
} |