| 1 |
< |
/* Copyright (c) 1991 Regents of the University of California */ |
| 1 |
> |
/* Copyright (c) 1997 Regents of the University of California */ |
| 2 |
|
|
| 3 |
|
/* SCCSid "$SunId$ LBL" */ |
| 4 |
|
|
| 69 |
|
#define CIE_y_w 0.3333 |
| 70 |
|
#endif |
| 71 |
|
|
| 72 |
< |
#define STDPRIMS {CIE_x_r,CIE_y_r,CIE_x_g,CIE_y_g, \ |
| 73 |
< |
CIE_x_b,CIE_y_b,CIE_x_w,CIE_y_w} |
| 72 |
> |
#define STDPRIMS {{CIE_x_r,CIE_y_r},{CIE_x_g,CIE_y_g}, \ |
| 73 |
> |
{CIE_x_b,CIE_y_b},{CIE_x_w,CIE_y_w}} |
| 74 |
|
|
| 75 |
|
#define CIE_D ( CIE_x_r*(CIE_y_g - CIE_y_b) + \ |
| 76 |
|
CIE_x_g*(CIE_y_b - CIE_y_r) + \ |
| 187 |
|
extern RGBPRIMS stdprims; /* standard primary chromaticities */ |
| 188 |
|
extern COLORMAT rgb2xyzmat; /* RGB to XYZ conversion matrix */ |
| 189 |
|
extern COLORMAT xyz2rgbmat; /* XYZ to RGB conversion matrix */ |
| 190 |
+ |
extern COLOR cblack, cwhite; /* black (0,0,0) and white (1,1,1) */ |
| 191 |
|
|
| 192 |
< |
#define cie_rgb(rgb,xyz) colortrans(rgb,xyz2rgbmat,xyz) |
| 192 |
> |
#define CGAMUT_LOWER 01 |
| 193 |
> |
#define CGAMUT_UPPER 02 |
| 194 |
> |
#define CGAMUT (CGAMUT_LOWER|CGAMUT_UPPER) |
| 195 |
> |
|
| 196 |
|
#define rgb_cie(xyz,rgb) colortrans(xyz,rgb2xyzmat,rgb) |
| 197 |
|
|
| 198 |
|
#ifdef BSD |
| 199 |
|
#define cpcolormat(md,ms) bcopy((char *)ms,(char *)md,sizeof(COLORMAT)) |
| 200 |
|
#else |
| 201 |
< |
extern char *memcpy(); |
| 198 |
< |
#define cpcolormat(md,ms) (void)memcpy((char *)md,(char *)ms,sizeof(COLORMAT)) |
| 201 |
> |
#define cpcolormat(md,ms) memcpy((char *)md,(char *)ms,sizeof(COLORMAT)) |
| 202 |
|
#endif |
