69 |
|
fclose(fp); |
70 |
|
curRF = rop->preop.csym; |
71 |
|
} |
72 |
< |
if ((refm.ncomp == 3) & (refm.dtype != DTspec)) { |
72 |
> |
if (refm.ncomp == 3) { |
73 |
|
rop->preop.csym = (refm.dtype == DTxyze) ? "XYZ" : "RGB"; |
74 |
|
return(checksymbolic(rop)); |
75 |
|
} |
103 |
|
for (j = refm.ncomp; j-- > 0; ) |
104 |
|
rop->preop.cmat[j*nc + i] = scresp[j]; |
105 |
|
} |
106 |
+ |
memcpy(rop->mtx->wlpart, refm.wlpart, sizeof(rop->mtx->wlpart)); |
107 |
|
return(0); |
108 |
|
} |
109 |
|
|
162 |
|
{ |
163 |
|
const int nc = rop->mtx->ncomp; |
164 |
|
const int dt = rop->mtx->dtype; |
165 |
+ |
double cf = 1; |
166 |
|
int i, j; |
167 |
|
/* check suffix => reference file */ |
168 |
|
if (strchr(rop->preop.csym, '.') > rop->preop.csym) |
183 |
|
int comp = 0; |
184 |
|
switch (rop->preop.csym[j]) { |
185 |
|
case 'B': |
186 |
+ |
case 'b': |
187 |
|
++comp; |
188 |
|
/* fall through */ |
189 |
|
case 'G': |
190 |
+ |
case 'g': |
191 |
|
++comp; |
192 |
|
/* fall through */ |
193 |
|
case 'R': |
194 |
+ |
case 'r': |
195 |
+ |
if (rop->preop.csym[j] <= 'Z') |
196 |
+ |
cf = 1./WHTEFFICACY; |
197 |
|
if (dt == DTxyze) { |
198 |
|
for (i = 3; i--; ) |
199 |
< |
rop->preop.cmat[j*nc+i] = 1./WHTEFFICACY * |
193 |
< |
xyz2rgbmat[comp][i]; |
199 |
> |
rop->preop.cmat[j*nc+i] = cf*xyz2rgbmat[comp][i]; |
200 |
|
} else if (nc == 3) |
201 |
|
rop->preop.cmat[j*nc+comp] = 1.; |
202 |
|
else |
203 |
|
rgbrow(rop, j, comp); |
204 |
|
break; |
205 |
|
case 'Z': |
206 |
+ |
case 'z': |
207 |
|
++comp; |
208 |
|
/* fall through */ |
209 |
|
case 'Y': |
210 |
+ |
case 'y': |
211 |
|
++comp; |
212 |
|
/* fall through */ |
213 |
|
case 'X': |
214 |
+ |
case 'x': |
215 |
+ |
if ((rop->preop.csym[j] <= 'Z') & (dt != DTxyze)) |
216 |
+ |
cf = WHTEFFICACY; |
217 |
|
if (dt == DTxyze) { |
218 |
|
rop->preop.cmat[j*nc+comp] = 1.; |
219 |
|
} else if (nc == 3) { |
225 |
|
else |
226 |
|
xyzrow(rop, j, comp); |
227 |
|
|
228 |
< |
for (i = nc*(dt != DTxyze); i--; ) |
229 |
< |
rop->preop.cmat[j*nc+i] *= WHTEFFICACY; |
228 |
> |
for (i = nc*(cf != 1); i--; ) |
229 |
> |
rop->preop.cmat[j*nc+i] *= cf; |
230 |
|
break; |
231 |
|
case 'S': /* scotopic (il)luminance */ |
232 |
+ |
cf = WHTSCOTOPIC; |
233 |
+ |
/* fall through */ |
234 |
+ |
case 's': |
235 |
|
sensrow(rop, j, scolor2scotopic); |
236 |
< |
for (i = nc; i--; ) |
237 |
< |
rop->preop.cmat[j*nc+i] *= WHTSCOTOPIC; |
236 |
> |
for (i = nc*(cf != 1); i--; ) |
237 |
> |
rop->preop.cmat[j*nc+i] *= cf; |
238 |
|
break; |
239 |
|
case 'M': /* melanopic (il)luminance */ |
240 |
+ |
cf = WHTMELANOPIC; |
241 |
+ |
/* fall through */ |
242 |
+ |
case 'm': |
243 |
|
sensrow(rop, j, scolor2melanopic); |
244 |
< |
for (i = nc; i--; ) |
245 |
< |
rop->preop.cmat[j*nc+i] *= WHTMELANOPIC; |
244 |
> |
for (i = nc*(cf != 1); i--; ) |
245 |
> |
rop->preop.cmat[j*nc+i] *= cf; |
246 |
|
break; |
247 |
|
case 'A': /* average component */ |
248 |
+ |
case 'a': |
249 |
|
for (i = nc; i--; ) |
250 |
|
rop->preop.cmat[j*nc+i] = 1./(double)nc; |
251 |
|
break; |
256 |
|
} |
257 |
|
} |
258 |
|
/* return recommended output type */ |
259 |
< |
if (!strcmp(rop->preop.csym, "XYZ")) { |
259 |
> |
if (!strcasecmp(rop->preop.csym, "XYZ")) { |
260 |
|
if (dt <= DTspec) |
261 |
|
return(DTxyze); |
262 |
< |
} else if (!strcmp(rop->preop.csym, "RGB")) { |
262 |
> |
} else if (!strcasecmp(rop->preop.csym, "RGB")) { |
263 |
|
if (dt <= DTspec) |
264 |
|
return(DTrgbe); |
265 |
< |
} |
248 |
< |
if ((nc > 3) & (dt <= DTspec)) |
265 |
> |
} else if (dt == DTspec) |
266 |
|
return(DTfloat); /* probably not actual spectrum */ |
267 |
|
return(0); |
268 |
|
} |
291 |
|
if (rop->preop.nsf == 1) { |
292 |
|
for (i = rop->preop.clen; i--; ) |
293 |
|
rop->preop.cmat[i] *= rop->preop.sca[0]; |
294 |
< |
} else if (rop->preop.nsf != rop->mtx->ncomp) { |
294 |
> |
} else if (rop->preop.nsf*rop->mtx->ncomp != rop->preop.clen) { |
295 |
|
fprintf(stderr, "%s: -s must have one or %d factors\n", |
296 |
< |
rop->inspec, rop->mtx->ncomp); |
296 |
> |
rop->inspec, |
297 |
> |
rop->preop.clen/rop->mtx->ncomp); |
298 |
|
goto failure; |
299 |
|
} else { |
300 |
< |
for (j = rop->preop.clen/rop->preop.nsf; j--; ) |
301 |
< |
for (i = rop->preop.nsf; i--; ) |
302 |
< |
rop->preop.cmat[j*rop->preop.nsf+i] *= |
303 |
< |
rop->preop.sca[i]; |
300 |
> |
for (i = rop->preop.nsf; i--; ) |
301 |
> |
for (j = rop->mtx->ncomp; j--; ) |
302 |
> |
rop->preop.cmat[i*rop->mtx->ncomp+j] |
303 |
> |
*= rop->preop.sca[i]; |
304 |
|
} |
305 |
|
} |
306 |
|
mres = rmx_transform(rop->mtx, rop->preop.clen/rop->mtx->ncomp, |