37 |
|
static LUTAB vtx_tab = LU_SINIT(free,free); /* vertex lookup table */ |
38 |
|
|
39 |
|
/* CIE 1931 Standard Observer curves */ |
40 |
< |
static C_COLOR cie_xf = { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF, |
40 |
> |
static C_COLOR cie_xf = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF, |
41 |
|
{14,42,143,435,1344,2839,3483,3362,2908,1954,956, |
42 |
|
320,49,93,633,1655,2904,4334,5945,7621,9163,10263, |
43 |
|
10622,10026,8544,6424,4479,2835,1649,874,468,227, |
44 |
|
114,58,29,14,7,3,2,1,0}, 106836L, .467, .368, 362.230 |
45 |
|
}; |
46 |
< |
static C_COLOR cie_yf = { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF, |
46 |
> |
static C_COLOR cie_yf = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF, |
47 |
|
{0,1,4,12,40,116,230,380,600,910,1390,2080,3230, |
48 |
|
5030,7100,8620,9540,9950,9950,9520,8700,7570,6310, |
49 |
|
5030,3810,2650,1750,1070,610,320,170,82,41,21,10, |
50 |
|
5,2,1,1,0,0}, 106856L, .398, .542, 493.525 |
51 |
|
}; |
52 |
< |
static C_COLOR cie_zf = { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF, |
52 |
> |
static C_COLOR cie_zf = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF, |
53 |
|
{65,201,679,2074,6456,13856,17471,17721,16692, |
54 |
|
12876,8130,4652,2720,1582,782,422,203,87,39,21,17, |
55 |
|
11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, |
56 |
|
106770L, .147, .077, 54.363 |
57 |
|
}; |
58 |
|
/* Derived CIE 1931 Primaries (imaginary) */ |
59 |
< |
static C_COLOR cie_xp = { 1, C_CDSPEC|C_CSSPEC|C_CSXY, |
59 |
> |
static C_COLOR cie_xp = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY, |
60 |
|
{-174,-198,-195,-197,-202,-213,-235,-272,-333, |
61 |
|
-444,-688,-1232,-2393,-4497,-6876,-6758,-5256, |
62 |
|
-3100,-815,1320,3200,4782,5998,6861,7408,7754, |
64 |
|
8336,8336,8336,8336,8336,8336}, |
65 |
|
127424L, 1., .0, |
66 |
|
}; |
67 |
< |
static C_COLOR cie_yp = { 1, C_CDSPEC|C_CSSPEC|C_CSXY, |
67 |
> |
static C_COLOR cie_yp = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY, |
68 |
|
{-451,-431,-431,-430,-427,-417,-399,-366,-312, |
69 |
|
-204,57,691,2142,4990,8810,9871,9122,7321,5145, |
70 |
|
3023,1123,-473,-1704,-2572,-3127,-3474,-3704, |
72 |
|
-4066,-4066,-4066,-4066,-4066,-4066}, |
73 |
|
-23035L, .0, 1., |
74 |
|
}; |
75 |
< |
static C_COLOR cie_zp = { 1, C_CDSPEC|C_CSSPEC|C_CSXY, |
75 |
> |
static C_COLOR cie_zp = { 1, NULL, C_CDSPEC|C_CSSPEC|C_CSXY, |
76 |
|
{4051,4054,4052,4053,4054,4056,4059,4064,4071, |
77 |
|
4074,4056,3967,3677,2933,1492,313,-440,-795, |
78 |
|
-904,-918,-898,-884,-869,-863,-855,-855,-851, |
130 |
|
c_ccname = lp->key; |
131 |
|
c_ccolor = (C_COLOR *)lp->data; |
132 |
|
c_ccolor->clock = 0; |
133 |
+ |
c_ccolor->client_data = NULL; |
134 |
|
} |
135 |
|
i = c_ccolor->clock; |
136 |
|
if (ac == 3) { /* use default template */ |
247 |
|
c_cmname = lp->key; |
248 |
|
c_cmaterial = (C_MATERIAL *)lp->data; |
249 |
|
c_cmaterial->clock = 0; |
250 |
+ |
c_cmaterial->client_data = NULL; |
251 |
|
} |
252 |
|
i = c_cmaterial->clock; |
253 |
|
if (ac == 3) { /* use default template */ |
394 |
|
return(MG_EMEM); |
395 |
|
c_cvname = lp->key; |
396 |
|
c_cvertex = (C_VERTEX *)lp->data; |
397 |
+ |
c_cvertex->clock = 0; |
398 |
+ |
c_cvertex->client_data = NULL; |
399 |
|
} |
400 |
|
i = c_cvertex->clock; |
401 |
|
if (ac == 3) { /* use default template */ |