| 100 |
|
ip->swapin = (nativebigendian() != i); |
| 101 |
|
return(0); |
| 102 |
|
} |
| 103 |
+ |
if (isexpos(s)) { |
| 104 |
+ |
double d = exposval(s); |
| 105 |
+ |
scalecolor(ip->mtx, d); |
| 106 |
+ |
return(0); |
| 107 |
+ |
} |
| 108 |
+ |
if (iscolcor(s)) { |
| 109 |
+ |
COLOR ctmp; |
| 110 |
+ |
colcorval(ctmp, s); |
| 111 |
+ |
multcolor(ip->mtx, ctmp); |
| 112 |
+ |
return(0); |
| 113 |
+ |
} |
| 114 |
|
if (!formatval(fmt, s)) { |
| 115 |
|
rmx_addinfo(ip, s); |
| 116 |
|
return(0); |
| 237 |
|
dinfo.dtype = DTascii; /* assumed w/o FORMAT */ |
| 238 |
|
dinfo.swapin = 0; |
| 239 |
|
dinfo.info = NULL; |
| 240 |
+ |
dinfo.mtx[0] = dinfo.mtx[1] = dinfo.mtx[2] = 1.; |
| 241 |
|
if (getheader(fp, get_dminfo, &dinfo) < 0) { |
| 242 |
|
fclose(fp); |
| 243 |
|
return(NULL); |
| 284 |
|
case DTxyze: |
| 285 |
|
if (!rmx_load_rgbe(dnew, fp)) |
| 286 |
|
goto loaderr; |
| 287 |
< |
dnew->dtype = dinfo.dtype; |
| 287 |
> |
dnew->dtype = dinfo.dtype; /* undo exposure? */ |
| 288 |
> |
if ((dinfo.mtx[0] != 1.) | (dinfo.mtx[1] != 1.) | |
| 289 |
> |
(dinfo.mtx[2] != 1.)) { |
| 290 |
> |
dinfo.mtx[0] = 1./dinfo.mtx[0]; |
| 291 |
> |
dinfo.mtx[1] = 1./dinfo.mtx[1]; |
| 292 |
> |
dinfo.mtx[2] = 1./dinfo.mtx[2]; |
| 293 |
> |
rmx_scale(dnew, dinfo.mtx); |
| 294 |
> |
} |
| 295 |
|
break; |
| 296 |
|
default: |
| 297 |
|
goto loaderr; |
