ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/color.h
(Generate patch)

Comparing ray/src/common/color.h (file contents):
Revision 2.10 by greg, Sun Oct 15 14:07:59 1995 UTC vs.
Revision 2.28 by schorsch, Sun Mar 28 20:33:12 2004 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1991 Regents of the University of California */
2 <
3 < /* SCCSid "$SunId$ LBL" */
4 <
1 > /* RCSid $Id$ */
2   /*
3   *  color.h - header for routines using pixel color values.
4   *
5 < *     12/31/85
5 > *  Must be included after X11 headers, since they declare a BYTE type.
6   *
7   *  Two color representations are used, one for calculation and
8   *  another for storage.  Calculation is done with three floats
9   *  for speed.  Stored color values use 4 bytes which contain
10   *  three single byte mantissas and a common exponent.
11   */
12 + #ifndef _RAD_COLOR_H_
13 + #define _RAD_COLOR_H_
14  
15 + #include <stdlib.h>
16 +
17 + #ifdef __cplusplus
18 + extern "C" {
19 + #endif
20 +
21   #define  RED            0
22   #define  GRN            1
23   #define  BLU            2
# Line 23 | Line 28
28   #define  COLXS          128     /* excess used for exponent */
29   #define  WHT            3       /* used for RGBPRIMS type */
30  
31 < typedef unsigned char  BYTE;    /* 8-bit unsigned integer */
31 > #undef  BYTE
32 > #define  BYTE   unsigned char   /* 8-bit unsigned integer */
33  
34   typedef BYTE  COLR[4];          /* red, green, blue (or X,Y,Z), exponent */
35  
36 < typedef float  COLOR[3];        /* red, green, blue (or X,Y,Z) */
36 > typedef float COLORV;
37 > typedef COLORV  COLOR[3];       /* red, green, blue (or X,Y,Z) */
38  
39   typedef float  RGBPRIMS[4][2];  /* (x,y) chromaticities for RGBW */
40   typedef float  (*RGBPRIMP)[2];  /* pointer to RGBPRIMS array */
# Line 69 | Line 76 | typedef float  COLORMAT[3][3]; /* color coordinate con
76   #define  CIE_y_w                0.3333
77   #endif
78  
79 < #define  STDPRIMS       {CIE_x_r,CIE_y_r,CIE_x_g,CIE_y_g, \
80 <                                CIE_x_b,CIE_y_b,CIE_x_w,CIE_y_w}
79 > #define  STDPRIMS       {{CIE_x_r,CIE_y_r},{CIE_x_g,CIE_y_g}, \
80 >                                {CIE_x_b,CIE_y_b},{CIE_x_w,CIE_y_w}}
81  
82   #define CIE_D           (       CIE_x_r*(CIE_y_g - CIE_y_b) + \
83                                  CIE_x_g*(CIE_y_b - CIE_y_r) + \
# Line 107 | Line 114 | typedef float  COLORMAT[3][3]; /* color coordinate con
114   #define  D65EFFICACY            203.            /* standard illuminant D65 */
115   #define  INCEFFICACY            160.            /* illuminant A (incand.) */
116   #define  SUNEFFICACY            208.            /* illuminant B (solar dir.) */
117 < #define  SKYEFFICACY            D65EFFICACY     /* skylight */
117 > #define  SKYEFFICACY            D65EFFICACY     /* skylight (should be 110) */
118   #define  DAYEFFICACY            D65EFFICACY     /* combined sky and solar */
119  
120   #define  luminance(col)         (WHTEFFICACY * bright(col))
# Line 174 | Line 181 | typedef float  COLORMAT[3][3]; /* color coordinate con
181   #define  fputcolcor(cc,fp)      fprintf(fp,"%s %f %f %f\n",COLCORSTR, \
182                                          (cc)[RED],(cc)[GRN],(cc)[BLU])
183  
177 #ifdef  DCL_ATOF
178 extern double  atof(), ldexp(), frexp();
179 #endif
180
184   /*
185   * Conversions to and from XYZ space generally don't apply WHTEFFICACY.
186   * If you need Y to be luminance (cd/m^2), this must be applied when
187   * converting from radiance (watts/sr/m^2).
188   */
189  
190 < extern RGBPRIMS  stdprims;              /* standard primary chromaticities */
191 < extern COLORMAT  rgb2xyzmat;            /* RGB to XYZ conversion matrix */
192 < extern COLORMAT  xyz2rgbmat;            /* XYZ to RGB conversion matrix */
190 > extern RGBPRIMS  stdprims;      /* standard primary chromaticities */
191 > extern COLORMAT  rgb2xyzmat;    /* RGB to XYZ conversion matrix */
192 > extern COLORMAT  xyz2rgbmat;    /* XYZ to RGB conversion matrix */
193 > extern COLOR  cblack, cwhite;   /* black (0,0,0) and white (1,1,1) */
194  
195 < #define  cie_rgb(rgb,xyz)       colortrans(rgb,xyz2rgbmat,xyz)
195 > #define  CGAMUT_LOWER           01
196 > #define  CGAMUT_UPPER           02
197 > #define  CGAMUT                 (CGAMUT_LOWER|CGAMUT_UPPER)
198 >
199   #define  rgb_cie(xyz,rgb)       colortrans(xyz,rgb2xyzmat,rgb)
200  
201 < #ifdef BSD
202 < #define  cpcolormat(md,ms)      bcopy((char *)ms,(char *)md,sizeof(COLORMAT))
203 < #else
204 < extern char  *memcpy();
205 < #define  cpcolormat(md,ms)      (void)memcpy((char *)md,(char *)ms,sizeof(COLORMAT))
201 > #define  cpcolormat(md,ms)      memcpy((void *)md,(void *)ms,sizeof(COLORMAT))
202 >
203 >                                        /* defined in color.c */
204 > extern char     *tempbuffer(unsigned int len);
205 > extern int      fwritecolrs(COLR *scanline, int len, FILE *fp);
206 > extern int      freadcolrs(COLR *scanline, int len, FILE *fp);
207 > extern int      fwritescan(COLOR *scanline, int len, FILE *fp);
208 > extern int      freadscan(COLOR *scanline, int len, FILE *fp);
209 > extern void     setcolr(COLR clr, double r, double g, double b);
210 > extern void     colr_color(COLOR col, COLR clr);
211 > extern int      bigdiff(COLOR c1, COLOR c2, double md);
212 >                                        /* defined in spec_rgb.c */
213 > extern void     spec_rgb(COLOR col, int s, int e);
214 > extern void     spec_cie(COLOR col, int s, int e);
215 > extern void     cie_rgb(COLOR rgb, COLOR xyz);
216 > extern int      clipgamut(COLOR col, double brt, int gamut,
217 >                                COLOR lower, COLOR upper);
218 > extern void     colortrans(COLOR c2, COLORMAT mat, COLOR c1);
219 > extern void     multcolormat(COLORMAT m3, COLORMAT m2,
220 >                                        COLORMAT m1);
221 > extern void     compxyz2rgbmat(COLORMAT mat, RGBPRIMS pr);
222 > extern void     comprgb2xyzmat(COLORMAT mat, RGBPRIMS pr);
223 > extern void     comprgb2rgbmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
224 > extern void     compxyzWBmat(COLORMAT mat, float wht1[2],
225 >                                float wht2[2]);
226 > extern void     compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr);
227 > extern void     comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr);
228 > extern void     comprgb2rgbWBmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
229 >                                        /* defined in colrops.c */
230 > extern int      setcolrcor(double (*f)(double, double), double a2);
231 > extern int      setcolrinv(double (*f)(double, double), double a2);
232 > extern int      setcolrgam(double g);
233 > extern int      colrs_gambs(COLR *scan, int len);
234 > extern int      gambs_colrs(COLR *scan, int len);
235 > extern void     shiftcolrs(COLR *scan, int len, int adjust);
236 > extern void     normcolrs(COLR *scan, int len, int adjust);
237 >
238 >
239 > #ifdef __cplusplus
240 > }
241   #endif
242 + #endif /* _RAD_COLOR_H_ */
243 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines