| 43 |
|
C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\ |
| 44 |
|
(long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 } |
| 45 |
|
|
| 46 |
< |
#define c_cval(c,l) ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum) |
| 46 |
> |
#define c_cval(c,l) ((c)->ssamp[((l)+(C_CWLI/2.-C_MINWL))/C_CWLI] \ |
| 47 |
> |
/ (double)(c)->ssum) |
| 48 |
|
|
| 49 |
< |
extern C_COLOR c_dfcolor; /* default color */ |
| 49 |
> |
extern const C_COLOR c_dfcolor; /* default color */ |
| 50 |
|
|
| 51 |
< |
extern void c_ccvt(C_COLOR *, int); /* fix color representation */ |
| 52 |
< |
extern int c_isgrey(C_COLOR *); /* check if color is grey */ |
| 51 |
> |
extern const C_COLOR c_x31, c_y31, c_z31; /* 1931 standard observer */ |
| 52 |
> |
|
| 53 |
> |
/* set CIE (x,y) chromaticity */ |
| 54 |
> |
#define c_cset(c,x,y) ((c)->cx=(x),(c)->cy=(y),(c)->flags=C_CDXY|C_CSXY) |
| 55 |
> |
|
| 56 |
> |
/* set black body spectrum */ |
| 57 |
> |
extern int c_bbtemp(C_COLOR *clr, double tk); |
| 58 |
> |
/* assign arbitrary spectrum */ |
| 59 |
> |
extern double c_sset(C_COLOR *clr, double wlmin, double wlmax, |
| 60 |
> |
const float spec[], int nwl); |
| 61 |
> |
extern void c_ccvt(C_COLOR *clr, int fl); /* fix color representation */ |
| 62 |
> |
extern int c_isgrey(C_COLOR *clr); /* check if color is grey */ |
| 63 |
|
/* mix two colors */ |
| 64 |
|
extern void c_cmix(C_COLOR *cres, double w1, C_COLOR *c1, |
| 65 |
|
double w2, C_COLOR *c2); |
| 66 |
< |
/* set black body spectrum */ |
| 67 |
< |
extern int c_bbtemp(C_COLOR *clr, double tk); |
| 66 |
> |
/* multiply two colors */ |
| 67 |
> |
extern double c_cmult(C_COLOR *cres, C_COLOR *c1, double y1, |
| 68 |
> |
C_COLOR *c2, double y2); |
| 69 |
> |
/* convert to sharpened RGB */ |
| 70 |
> |
extern void c_toSharpRGB(C_COLOR *cin, double cieY, float cout[3]); |
| 71 |
> |
/* convert from sharpened RGB */ |
| 72 |
> |
extern double c_fromSharpRGB(float cin[3], C_COLOR *cout); |
| 73 |
> |
|
| 74 |
> |
/* The following two routines are not defined in ccolor.c */ |
| 75 |
|
/* convert to RGB color */ |
| 76 |
|
extern void ccy2rgb(C_COLOR *cin, double cieY, float cout[3]); |
| 77 |
|
/* convert from RGB color */ |
