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 |
|
|
245 |
|
} else if (!strcmp(rop->preop.csym, "RGB")) { |
246 |
|
if (dt <= DTspec) |
247 |
|
return(DTrgbe); |
248 |
< |
} |
248 |
< |
if ((nc > 3) & (dt <= DTspec)) |
248 |
> |
} else if (dt == DTspec) |
249 |
|
return(DTfloat); /* probably not actual spectrum */ |
250 |
|
return(0); |
251 |
|
} |