22 |
|
{-0.0123, 0.0167, 0.9955} |
23 |
|
}; |
24 |
|
|
25 |
< |
C_COLOR c_dfcolor = C_DEFCOLOR; |
25 |
> |
const C_COLOR c_dfcolor = C_DEFCOLOR; |
26 |
|
|
27 |
|
/* CIE 1931 Standard Observer curves */ |
28 |
< |
static const C_COLOR cie_xf = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF, |
28 |
> |
const C_COLOR c_x31 = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF, |
29 |
|
{14,42,143,435,1344,2839,3483,3362,2908,1954,956, |
30 |
|
320,49,93,633,1655,2904,4334,5945,7621,9163,10263, |
31 |
|
10622,10026,8544,6424,4479,2835,1649,874,468,227, |
32 |
|
114,58,29,14,7,3,2,1,0}, 106836L, .467, .368, 362.230 |
33 |
|
}; |
34 |
< |
static const C_COLOR cie_yf = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF, |
34 |
> |
const C_COLOR c_y31 = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF, |
35 |
|
{0,1,4,12,40,116,230,380,600,910,1390,2080,3230, |
36 |
|
5030,7100,8620,9540,9950,9950,9520,8700,7570,6310, |
37 |
|
5030,3810,2650,1750,1070,610,320,170,82,41,21,10, |
38 |
|
5,2,1,1,0,0}, 106856L, .398, .542, 493.525 |
39 |
|
}; |
40 |
< |
static const C_COLOR cie_zf = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF, |
40 |
> |
const C_COLOR c_z31 = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF, |
41 |
|
{65,201,679,2074,6456,13856,17471,17721,16692, |
42 |
|
12876,8130,4652,2720,1582,782,422,203,87,39,21,17, |
43 |
|
11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, |
96 |
|
{ |
97 |
|
double xyz[3], sf; |
98 |
|
|
99 |
– |
xyz[0] = XYZfromSharp[0][0]*cin[0] + XYZfromSharp[0][1]*cin[1] + |
100 |
– |
XYZfromSharp[0][2]*cin[2]; |
99 |
|
xyz[1] = XYZfromSharp[1][0]*cin[0] + XYZfromSharp[1][1]*cin[1] + |
100 |
|
XYZfromSharp[1][2]*cin[2]; |
101 |
+ |
if (xyz[1] <= 1e-6) { |
102 |
+ |
*cout = c_dfcolor; /* punting, here... */ |
103 |
+ |
return xyz[1]; |
104 |
+ |
} |
105 |
+ |
xyz[0] = XYZfromSharp[0][0]*cin[0] + XYZfromSharp[0][1]*cin[1] + |
106 |
+ |
XYZfromSharp[0][2]*cin[2]; |
107 |
|
xyz[2] = XYZfromSharp[2][0]*cin[0] + XYZfromSharp[2][1]*cin[1] + |
108 |
|
XYZfromSharp[2][2]*cin[2]; |
109 |
< |
|
109 |
> |
|
110 |
|
sf = 1./(xyz[0] + xyz[1] + xyz[2]); |
111 |
|
|
112 |
|
cout->cx = xyz[0] * sf; |
116 |
|
return(xyz[1]); |
117 |
|
} |
118 |
|
|
119 |
< |
/* assign arbitrary spectrum */ |
119 |
> |
/* assign arbitrary spectrum and return Y value */ |
120 |
|
double |
121 |
|
c_sset(C_COLOR *clr, double wlmin, double wlmax, const float spec[], int nwl) |
122 |
|
{ |
138 |
|
wlmax -= wlstep; |
139 |
|
--nwl; |
140 |
|
} |
141 |
+ |
if ((nwl <= 1) | (wlmin >= wlmax)) |
142 |
+ |
return(0.); |
143 |
|
imax = nwl; /* box filter if necessary */ |
144 |
|
boxpos = 0; |
145 |
|
boxstep = 1; |
165 |
|
scale = va[i]; |
166 |
|
else if (va[i] < -scale) |
167 |
|
scale = -va[i]; |
168 |
< |
yval += va[i] * cie_yf.ssamp[i]; |
168 |
> |
yval += va[i] * c_y31.ssamp[i]; |
169 |
|
} |
170 |
|
if (scale <= 1e-7) |
171 |
|
return(0.); |
172 |
< |
yval /= (double)cie_yf.ssum; |
172 |
> |
yval /= (double)c_y31.ssum; |
173 |
|
scale = C_CMAXV / scale; |
174 |
|
clr->ssum = 0; /* convert to our spacing */ |
175 |
|
wl0 = wlmin; |
224 |
|
if (fl & C_CSXY) { /* cspec -> cxy */ |
225 |
|
x = y = z = 0.; |
226 |
|
for (i = 0; i < C_CNSS; i++) { |
227 |
< |
x += cie_xf.ssamp[i] * clr->ssamp[i]; |
228 |
< |
y += cie_yf.ssamp[i] * clr->ssamp[i]; |
229 |
< |
z += cie_zf.ssamp[i] * clr->ssamp[i]; |
227 |
> |
x += c_x31.ssamp[i] * clr->ssamp[i]; |
228 |
> |
y += c_y31.ssamp[i] * clr->ssamp[i]; |
229 |
> |
z += c_z31.ssamp[i] * clr->ssamp[i]; |
230 |
|
} |
231 |
< |
x /= (double)cie_xf.ssum; |
232 |
< |
y /= (double)cie_yf.ssum; |
233 |
< |
z /= (double)cie_zf.ssum; |
231 |
> |
x /= (double)c_x31.ssum; |
232 |
> |
y /= (double)c_y31.ssum; |
233 |
> |
z /= (double)c_z31.ssum; |
234 |
|
z += x + y; |
235 |
|
clr->cx = x / z; |
236 |
|
clr->cy = y / z; |
237 |
|
clr->flags |= C_CSXY; |
238 |
< |
} else if (fl & C_CSSPEC) { /* cxy -> cspec */ |
238 |
> |
} |
239 |
> |
if (fl & C_CSSPEC) { /* cxy -> cspec */ |
240 |
|
x = clr->cx; |
241 |
|
y = clr->cy; |
242 |
|
z = 1. - x - y; |
255 |
|
if (clr->flags & C_CSSPEC) { /* from spectrum */ |
256 |
|
y = 0.; |
257 |
|
for (i = 0; i < C_CNSS; i++) |
258 |
< |
y += cie_yf.ssamp[i] * clr->ssamp[i]; |
258 |
> |
y += c_y31.ssamp[i] * clr->ssamp[i]; |
259 |
|
clr->eff = C_CLPWM * y / clr->ssum; |
260 |
|
} else /* clr->flags & C_CSXY */ { /* from (x,y) */ |
261 |
< |
clr->eff = clr->cx*cie_xf.eff + clr->cy*cie_yf.eff + |
262 |
< |
(1. - clr->cx - clr->cy)*cie_zf.eff; |
261 |
> |
clr->eff = clr->cx*c_x31.eff + clr->cy*c_y31.eff + |
262 |
> |
(1. - clr->cx - clr->cy)*c_z31.eff; |
263 |
|
} |
264 |
|
clr->flags |= C_CSEFF; |
265 |
|
} |
338 |
|
cres->ssum += cres->ssamp[i] = cmix[i] / cmax; |
339 |
|
cres->flags = C_CDSPEC|C_CSSPEC; |
340 |
|
|
341 |
< |
c_ccvt(cres, C_CSEFF); /* nasty, but true */ |
342 |
< |
yres = y1 * y2 * cie_yf.ssum * C_CLPWM / |
341 |
> |
c_ccvt(cres, C_CSEFF); /* below is correct */ |
342 |
> |
yres = y1 * y2 * c_y31.ssum * C_CLPWM / |
343 |
|
(c1->eff*c1->ssum * c2->eff*c2->ssum) * |
344 |
|
cres->eff*( cres->ssum*(double)cmax + |
345 |
|
C_CNSS/2.0*(cmax-1) ); |
390 |
|
#undef C2 |
391 |
|
#undef bbsp |
392 |
|
#undef bblm |
393 |
+ |
|
394 |
+ |
#define UV_NORMF 410. |
395 |
+ |
|
396 |
+ |
/* encode (x,y) chromaticity */ |
397 |
+ |
C_CHROMA |
398 |
+ |
c_encodeChroma(C_COLOR *clr) |
399 |
+ |
{ |
400 |
+ |
double df; |
401 |
+ |
int ub, vb; |
402 |
+ |
|
403 |
+ |
c_ccvt(clr, C_CSXY); |
404 |
+ |
df = UV_NORMF/(-2.*clr->cx + 12.*clr->cy + 3.); |
405 |
+ |
ub = 4.*clr->cx * df; |
406 |
+ |
if (ub < 0) ub = 0; |
407 |
+ |
else if (ub > 0xff) ub = 0xff; |
408 |
+ |
vb = 9.*clr->cy * df; |
409 |
+ |
if (vb < 0) vb = 0; |
410 |
+ |
else if (vb > 0xff) vb = 0xff; |
411 |
+ |
|
412 |
+ |
return(vb<<8 | ub); |
413 |
+ |
} |
414 |
+ |
|
415 |
+ |
/* decode (x,y) chromaticity */ |
416 |
+ |
void |
417 |
+ |
c_decodeChroma(C_COLOR *cres, C_CHROMA ccode) |
418 |
+ |
{ |
419 |
+ |
double up = ((ccode & 0xff) + .5)*(1./UV_NORMF); |
420 |
+ |
double vp = ((ccode>>8 & 0xff) + .5)*(1./UV_NORMF); |
421 |
+ |
double df = 1./(6.*up - 16.*vp + 12.); |
422 |
+ |
|
423 |
+ |
cres->cx = 9.*up * df; |
424 |
+ |
cres->cy = 4.*vp * df; |
425 |
+ |
cres->flags = C_CDXY|C_CSXY; |
426 |
+ |
} |
427 |
+ |
|
428 |
+ |
#undef UV_NORMF |