--- ray/src/common/color.h 1997/01/30 19:14:37 2.12 +++ ray/src/common/color.h 2022/03/05 17:18:02 2.36 @@ -1,18 +1,22 @@ -/* Copyright (c) 1997 Regents of the University of California */ - -/* SCCSid "$SunId$ LBL" */ - +/* RCSid $Id: color.h,v 2.36 2022/03/05 17:18:02 greg Exp $ */ /* * color.h - header for routines using pixel color values. * - * 12/31/85 - * * Two color representations are used, one for calculation and * another for storage. Calculation is done with three floats * for speed. Stored color values use 4 bytes which contain * three single byte mantissas and a common exponent. */ +#ifndef _RAD_COLOR_H_ +#define _RAD_COLOR_H_ +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + #define RED 0 #define GRN 1 #define BLU 2 @@ -23,11 +27,13 @@ #define COLXS 128 /* excess used for exponent */ #define WHT 3 /* used for RGBPRIMS type */ -typedef unsigned char BYTE; /* 8-bit unsigned integer */ +#undef uby8 +#define uby8 unsigned char /* 8-bit unsigned integer */ -typedef BYTE COLR[4]; /* red, green, blue (or X,Y,Z), exponent */ +typedef uby8 COLR[4]; /* red, green, blue (or X,Y,Z), exponent */ -typedef float COLOR[3]; /* red, green, blue (or X,Y,Z) */ +typedef float COLORV; +typedef COLORV COLOR[3]; /* red, green, blue (or X,Y,Z) */ typedef float RGBPRIMS[4][2]; /* (x,y) chromaticities for RGBW */ typedef float (*RGBPRIMP)[2]; /* pointer to RGBPRIMS array */ @@ -49,15 +55,24 @@ typedef float COLORMAT[3][3]; /* color coordinate con #define multcolor(c1,c2) ((c1)[0]*=(c2)[0],(c1)[1]*=(c2)[1],(c1)[2]*=(c2)[2]) -#ifdef NTSC +#if defined(NTSC_RGB) #define CIE_x_r 0.670 /* standard NTSC primaries */ #define CIE_y_r 0.330 #define CIE_x_g 0.210 #define CIE_y_g 0.710 #define CIE_x_b 0.140 #define CIE_y_b 0.080 -#define CIE_x_w 0.3333 /* use true white */ -#define CIE_y_w 0.3333 +#define CIE_x_w (1./3.) /* use EE white */ +#define CIE_y_w (1./3.) +#elif defined(SHARP_RGB) +#define CIE_x_r 0.6898 /* "sharp" RGB primaries */ +#define CIE_y_r 0.3206 +#define CIE_x_g 0.0736 +#define CIE_y_g 0.9003 +#define CIE_x_b 0.1166 +#define CIE_y_b 0.0374 +#define CIE_x_w (1./3.) /* use EE white */ +#define CIE_y_w (1./3.) #else #define CIE_x_r 0.640 /* nominal CRT primaries */ #define CIE_y_r 0.330 @@ -65,12 +80,12 @@ typedef float COLORMAT[3][3]; /* color coordinate con #define CIE_y_g 0.600 #define CIE_x_b 0.150 #define CIE_y_b 0.060 -#define CIE_x_w 0.3333 /* use true white */ -#define CIE_y_w 0.3333 +#define CIE_x_w (1./3.) /* use EE white */ +#define CIE_y_w (1./3.) #endif -#define STDPRIMS {CIE_x_r,CIE_y_r,CIE_x_g,CIE_y_g, \ - CIE_x_b,CIE_y_b,CIE_x_w,CIE_y_w} +#define STDPRIMS {{CIE_x_r,CIE_y_r},{CIE_x_g,CIE_y_g}, \ + {CIE_x_b,CIE_y_b},{CIE_x_w,CIE_y_w}} #define CIE_D ( CIE_x_r*(CIE_y_g - CIE_y_b) + \ CIE_x_g*(CIE_y_b - CIE_y_r) + \ @@ -92,7 +107,7 @@ typedef float COLORMAT[3][3]; /* color coordinate con #define CIE_gf (CIE_y_g*CIE_C_gD/CIE_D) #define CIE_bf (CIE_y_b*CIE_C_bD/CIE_D) -/* As of 9-94, CIE_rf=.265074126, CIE_gf=.670114631 and CIE_bf=.064811243 */ +/* Default CIE_rf=.265074126, CIE_gf=.670114631 and CIE_bf=.064811243 */ /***** The following definitions are valid for RGB colors only... *****/ @@ -107,7 +122,7 @@ typedef float COLORMAT[3][3]; /* color coordinate con #define D65EFFICACY 203. /* standard illuminant D65 */ #define INCEFFICACY 160. /* illuminant A (incand.) */ #define SUNEFFICACY 208. /* illuminant B (solar dir.) */ -#define SKYEFFICACY D65EFFICACY /* skylight */ +#define SKYEFFICACY D65EFFICACY /* skylight (should be 110) */ #define DAYEFFICACY D65EFFICACY /* combined sky and solar */ #define luminance(col) (WHTEFFICACY * bright(col)) @@ -151,12 +166,12 @@ typedef float COLORMAT[3][3]; /* color coordinate con #define PRIMARYSTR "PRIMARIES=" #define LPRIMARYSTR 10 #define isprims(hl) (!strncmp(hl,PRIMARYSTR,LPRIMARYSTR)) -#define primsval(p,hl) sscanf(hl+LPRIMARYSTR, \ +#define primsval(p,hl) (sscanf((hl)+LPRIMARYSTR, \ "%f %f %f %f %f %f %f %f", \ &(p)[RED][CIEX],&(p)[RED][CIEY], \ &(p)[GRN][CIEX],&(p)[GRN][CIEY], \ &(p)[BLU][CIEX],&(p)[BLU][CIEY], \ - &(p)[WHT][CIEX],&(p)[WHT][CIEY]) + &(p)[WHT][CIEX],&(p)[WHT][CIEY]) == 8) #define fputprims(p,fp) fprintf(fp, \ "%s %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f\n",\ PRIMARYSTR, \ @@ -169,31 +184,69 @@ typedef float COLORMAT[3][3]; /* color coordinate con #define COLCORSTR "COLORCORR=" #define LCOLCORSTR 10 #define iscolcor(hl) (!strncmp(hl,COLCORSTR,LCOLCORSTR)) -#define colcorval(cc,hl) sscanf(hl+LCOLCORSTR,"%f %f %f", \ +#define colcorval(cc,hl) sscanf((hl)+LCOLCORSTR,"%f %f %f", \ &(cc)[RED],&(cc)[GRN],&(cc)[BLU]) #define fputcolcor(cc,fp) fprintf(fp,"%s %f %f %f\n",COLCORSTR, \ (cc)[RED],(cc)[GRN],(cc)[BLU]) -#ifdef DCL_ATOF -extern double atof(), ldexp(), frexp(); -#endif - /* * Conversions to and from XYZ space generally don't apply WHTEFFICACY. * If you need Y to be luminance (cd/m^2), this must be applied when * converting from radiance (watts/sr/m^2). */ -extern RGBPRIMS stdprims; /* standard primary chromaticities */ -extern COLORMAT rgb2xyzmat; /* RGB to XYZ conversion matrix */ -extern COLORMAT xyz2rgbmat; /* XYZ to RGB conversion matrix */ +extern RGBPRIMS stdprims; /* standard primary chromaticities */ +extern COLORMAT rgb2xyzmat; /* RGB to XYZ conversion matrix */ +extern COLORMAT xyz2rgbmat; /* XYZ to RGB conversion matrix */ +extern COLOR cblack, cwhite; /* black (0,0,0) and white (1,1,1) */ -#define cie_rgb(rgb,xyz) colortrans(rgb,xyz2rgbmat,xyz,1) -#define rgb_cie(xyz,rgb) colortrans(xyz,rgb2xyzmat,rgb,1) +#define CGAMUT_LOWER 01 +#define CGAMUT_UPPER 02 +#define CGAMUT (CGAMUT_LOWER|CGAMUT_UPPER) -#ifdef BSD -#define cpcolormat(md,ms) bcopy((char *)ms,(char *)md,sizeof(COLORMAT)) -#else -extern char *memcpy(); -#define cpcolormat(md,ms) (void)memcpy((char *)md,(char *)ms,sizeof(COLORMAT)) +#define rgb_cie(xyz,rgb) colortrans(xyz,rgb2xyzmat,rgb) + +#define cpcolormat(md,ms) memcpy((void *)md,(void *)ms,sizeof(COLORMAT)) + + /* defined in color.c */ +extern void *tempbuffer(unsigned int len); +extern int fwritecolrs(COLR *scanline, int len, FILE *fp); +extern int freadcolrs(COLR *scanline, int len, FILE *fp); +extern int fwritescan(COLOR *scanline, int len, FILE *fp); +extern int freadscan(COLOR *scanline, int len, FILE *fp); +extern void setcolr(COLR clr, double r, double g, double b); +extern void colr_color(COLOR col, COLR clr); +extern int bigdiff(COLOR c1, COLOR c2, double md); + /* defined in spec_rgb.c */ +extern void spec_rgb(COLOR col, int s, int e); +extern void spec_cie(COLOR col, int s, int e); +extern void cie_rgb(COLOR rgb, COLOR xyz); +extern int clipgamut(COLOR col, double brt, int gamut, + COLOR lower, COLOR upper); +extern void colortrans(COLOR c2, COLORMAT mat, COLOR c1); +extern void multcolormat(COLORMAT m3, COLORMAT m2, + COLORMAT m1); +extern int colorprimsOK(RGBPRIMS pr); +extern int compxyz2rgbmat(COLORMAT mat, RGBPRIMS pr); +extern int comprgb2xyzmat(COLORMAT mat, RGBPRIMS pr); +extern int comprgb2rgbmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2); +extern int compxyzWBmat(COLORMAT mat, float wht1[2], + float wht2[2]); +extern int compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr); +extern int comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr); +extern int comprgb2rgbWBmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2); + /* defined in colrops.c */ +extern int setcolrcor(double (*f)(double, double), double a2); +extern int setcolrinv(double (*f)(double, double), double a2); +extern int setcolrgam(double g); +extern int colrs_gambs(COLR *scan, int len); +extern int gambs_colrs(COLR *scan, int len); +extern void shiftcolrs(COLR *scan, int len, int adjust); +extern void normcolrs(COLR *scan, int len, int adjust); + + +#ifdef __cplusplus +} #endif +#endif /* _RAD_COLOR_H_ */ +