--- ray/src/common/color.h 1994/08/17 11:07:56 2.8 +++ ray/src/common/color.h 2003/07/14 22:23:59 2.25 @@ -1,33 +1,48 @@ -/* Copyright (c) 1991 Regents of the University of California */ - -/* SCCSid "$SunId$ LBL" */ - +/* RCSid $Id: color.h,v 2.25 2003/07/14 22:23:59 schorsch Exp $ */ /* * color.h - header for routines using pixel color values. * - * 12/31/85 + * Must be included after X11 headers, since they declare a BYTE type. * * 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 + +#ifdef __cplusplus +extern "C" { +#endif + #define RED 0 #define GRN 1 #define BLU 2 -#define EXP 3 +#define CIEX 0 /* or, if input is XYZ... */ +#define CIEY 1 +#define CIEZ 2 +#define EXP 3 /* exponent same for either format */ #define COLXS 128 /* excess used for exponent */ +#define WHT 3 /* used for RGBPRIMS type */ -typedef unsigned char BYTE; /* 8-bit unsigned integer */ +#undef BYTE +#define BYTE unsigned char /* 8-bit unsigned integer */ -typedef BYTE COLR[4]; /* red, green, blue, exponent */ +typedef BYTE COLR[4]; /* red, green, blue (or X,Y,Z), exponent */ +typedef float 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 */ + +typedef float COLORMAT[3][3]; /* color coordinate conversion matrix */ + #define copycolr(c1,c2) (c1[0]=c2[0],c1[1]=c2[1], \ c1[2]=c2[2],c1[3]=c2[3]) -typedef float COLOR[3]; /* red, green, blue */ - #define colval(col,pri) ((col)[pri]) #define setcolor(col,r,g,b) ((col)[RED]=(r),(col)[GRN]=(g),(col)[BLU]=(b)) @@ -60,6 +75,9 @@ typedef float COLOR[3]; /* red, green, blue */ #define CIE_y_w 0.3333 #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 CIE_D ( CIE_x_r*(CIE_y_g - CIE_y_b) + \ CIE_x_g*(CIE_y_b - CIE_y_r) + \ CIE_x_b*(CIE_y_r - CIE_y_g) ) @@ -80,6 +98,10 @@ typedef float COLOR[3]; /* red, green, blue */ #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 */ + +/***** The following definitions are valid for RGB colors only... *****/ + #define bright(col) (CIE_rf*(col)[RED]+CIE_gf*(col)[GRN]+CIE_bf*(col)[BLU]) #define normbright(c) ( ( (long)(CIE_rf*256.+.5)*(c)[RED] + \ (long)(CIE_gf*256.+.5)*(c)[GRN] + \ @@ -96,6 +118,8 @@ typedef float COLOR[3]; /* red, green, blue */ #define luminance(col) (WHTEFFICACY * bright(col)) +/***** ...end of stuff specific to RGB colors *****/ + #define intens(col) ( (col)[0] > (col)[1] \ ? (col)[0] > (col)[2] ? (col)[0] : (col)[2] \ : (col)[1] > (col)[2] ? (col)[1] : (col)[2] ) @@ -111,6 +135,9 @@ typedef float COLOR[3]; /* red, green, blue */ /* picture format identifier */ #define COLRFMT "32-bit_rle_rgbe" +#define CIEFMT "32-bit_rle_xyze" +#define PICFMT "32-bit_rle_???e" /* matches either */ +#define LPICFMT 15 /* max format id len */ /* macros for exposures */ #define EXPOSSTR "EXPOSURE=" @@ -126,6 +153,24 @@ typedef float COLOR[3]; /* red, green, blue */ #define aspectval(hl) atof((hl)+LASPECTSTR) #define fputaspect(pa,fp) fprintf(fp,"%s%f\n",ASPECTSTR,pa) + /* macros for primary specifications */ +#define PRIMARYSTR "PRIMARIES=" +#define LPRIMARYSTR 10 +#define isprims(hl) (!strncmp(hl,PRIMARYSTR,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]) +#define fputprims(p,fp) fprintf(fp, \ + "%s %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f\n",\ + PRIMARYSTR, \ + (p)[RED][CIEX],(p)[RED][CIEY], \ + (p)[GRN][CIEX],(p)[GRN][CIEY], \ + (p)[BLU][CIEX],(p)[BLU][CIEY], \ + (p)[WHT][CIEX],(p)[WHT][CIEY]) + /* macros for color correction */ #define COLCORSTR "COLORCORR=" #define LCOLCORSTR 10 @@ -135,6 +180,63 @@ typedef float COLOR[3]; /* red, green, blue */ #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(); +/* + * 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 COLOR cblack, cwhite; /* black (0,0,0) and white (1,1,1) */ + +#define CGAMUT_LOWER 01 +#define CGAMUT_UPPER 02 +#define CGAMUT (CGAMUT_LOWER|CGAMUT_UPPER) + +#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 char *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 void compxyz2rgbmat(COLORMAT mat, RGBPRIMS pr); +extern void comprgb2xyzmat(COLORMAT mat, RGBPRIMS pr); +extern void comprgb2rgbmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2); +extern void compxyzWBmat(COLORMAT mat, float wht1[2], + float wht2[2]); +extern void compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr); +extern void comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr); +extern void comprgb2rgbWBmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2); + /* defined in colrops.c */ +extern int setcolrcor(double (*f)(), double a2); +extern int setcolrinv(double (*f)(), 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_ */ +