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.12 by greg, Thu Jan 30 19:14:37 1997 UTC vs.
Revision 2.33 by greg, Wed Sep 11 16:00:13 2013 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1997 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   *
8 *     12/31/85
9 *
5   *  Two color representations are used, one for calculation and
6   *  another for storage.  Calculation is done with three floats
7   *  for speed.  Stored color values use 4 bytes which contain
8   *  three single byte mantissas and a common exponent.
9   */
10 + #ifndef _RAD_COLOR_H_
11 + #define _RAD_COLOR_H_
12  
13 + #include <stdio.h>
14 + #include <stdlib.h>
15 +
16 + #ifdef __cplusplus
17 + extern "C" {
18 + #endif
19 +
20   #define  RED            0
21   #define  GRN            1
22   #define  BLU            2
# Line 23 | Line 27
27   #define  COLXS          128     /* excess used for exponent */
28   #define  WHT            3       /* used for RGBPRIMS type */
29  
30 < typedef unsigned char  BYTE;    /* 8-bit unsigned integer */
30 > #undef uby8
31 > #define uby8  unsigned char     /* 8-bit unsigned integer */
32  
33 < typedef BYTE  COLR[4];          /* red, green, blue (or X,Y,Z), exponent */
33 > typedef uby8  COLR[4];          /* red, green, blue (or X,Y,Z), exponent */
34  
35 < typedef float  COLOR[3];        /* red, green, blue (or X,Y,Z) */
35 > typedef float COLORV;
36 > typedef COLORV  COLOR[3];       /* red, green, blue (or X,Y,Z) */
37  
38   typedef float  RGBPRIMS[4][2];  /* (x,y) chromaticities for RGBW */
39   typedef float  (*RGBPRIMP)[2];  /* pointer to RGBPRIMS array */
# Line 69 | Line 75 | typedef float  COLORMAT[3][3]; /* color coordinate con
75   #define  CIE_y_w                0.3333
76   #endif
77  
78 < #define  STDPRIMS       {CIE_x_r,CIE_y_r,CIE_x_g,CIE_y_g, \
79 <                                CIE_x_b,CIE_y_b,CIE_x_w,CIE_y_w}
78 > #define  STDPRIMS       {{CIE_x_r,CIE_y_r},{CIE_x_g,CIE_y_g}, \
79 >                                {CIE_x_b,CIE_y_b},{CIE_x_w,CIE_y_w}}
80  
81   #define CIE_D           (       CIE_x_r*(CIE_y_g - CIE_y_b) + \
82                                  CIE_x_g*(CIE_y_b - CIE_y_r) + \
# Line 107 | Line 113 | typedef float  COLORMAT[3][3]; /* color coordinate con
113   #define  D65EFFICACY            203.            /* standard illuminant D65 */
114   #define  INCEFFICACY            160.            /* illuminant A (incand.) */
115   #define  SUNEFFICACY            208.            /* illuminant B (solar dir.) */
116 < #define  SKYEFFICACY            D65EFFICACY     /* skylight */
116 > #define  SKYEFFICACY            D65EFFICACY     /* skylight (should be 110) */
117   #define  DAYEFFICACY            D65EFFICACY     /* combined sky and solar */
118  
119   #define  luminance(col)         (WHTEFFICACY * bright(col))
# Line 151 | Line 157 | typedef float  COLORMAT[3][3]; /* color coordinate con
157   #define  PRIMARYSTR             "PRIMARIES="
158   #define  LPRIMARYSTR            10
159   #define  isprims(hl)            (!strncmp(hl,PRIMARYSTR,LPRIMARYSTR))
160 < #define  primsval(p,hl)         sscanf(hl+LPRIMARYSTR, \
160 > #define  primsval(p,hl)         (sscanf((hl)+LPRIMARYSTR, \
161                                          "%f %f %f %f %f %f %f %f", \
162                                          &(p)[RED][CIEX],&(p)[RED][CIEY], \
163                                          &(p)[GRN][CIEX],&(p)[GRN][CIEY], \
164                                          &(p)[BLU][CIEX],&(p)[BLU][CIEY], \
165 <                                        &(p)[WHT][CIEX],&(p)[WHT][CIEY])
165 >                                        &(p)[WHT][CIEX],&(p)[WHT][CIEY]) == 8)
166   #define  fputprims(p,fp)        fprintf(fp, \
167                                  "%s %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f\n",\
168                                          PRIMARYSTR, \
# Line 169 | Line 175 | typedef float  COLORMAT[3][3]; /* color coordinate con
175   #define  COLCORSTR              "COLORCORR="
176   #define  LCOLCORSTR             10
177   #define  iscolcor(hl)           (!strncmp(hl,COLCORSTR,LCOLCORSTR))
178 < #define  colcorval(cc,hl)       sscanf(hl+LCOLCORSTR,"%f %f %f", \
178 > #define  colcorval(cc,hl)       sscanf((hl)+LCOLCORSTR,"%f %f %f", \
179                                          &(cc)[RED],&(cc)[GRN],&(cc)[BLU])
180   #define  fputcolcor(cc,fp)      fprintf(fp,"%s %f %f %f\n",COLCORSTR, \
181                                          (cc)[RED],(cc)[GRN],(cc)[BLU])
182  
177 #ifdef  DCL_ATOF
178 extern double  atof(), ldexp(), frexp();
179 #endif
180
183   /*
184   * Conversions to and from XYZ space generally don't apply WHTEFFICACY.
185   * If you need Y to be luminance (cd/m^2), this must be applied when
186   * converting from radiance (watts/sr/m^2).
187   */
188  
189 < extern RGBPRIMS  stdprims;              /* standard primary chromaticities */
190 < extern COLORMAT  rgb2xyzmat;            /* RGB to XYZ conversion matrix */
191 < extern COLORMAT  xyz2rgbmat;            /* XYZ to RGB conversion matrix */
189 > extern RGBPRIMS  stdprims;      /* standard primary chromaticities */
190 > extern COLORMAT  rgb2xyzmat;    /* RGB to XYZ conversion matrix */
191 > extern COLORMAT  xyz2rgbmat;    /* XYZ to RGB conversion matrix */
192 > extern COLOR  cblack, cwhite;   /* black (0,0,0) and white (1,1,1) */
193  
194 < #define  cie_rgb(rgb,xyz)       colortrans(rgb,xyz2rgbmat,xyz,1)
195 < #define  rgb_cie(xyz,rgb)       colortrans(xyz,rgb2xyzmat,rgb,1)
194 > #define  CGAMUT_LOWER           01
195 > #define  CGAMUT_UPPER           02
196 > #define  CGAMUT                 (CGAMUT_LOWER|CGAMUT_UPPER)
197  
198 < #ifdef BSD
199 < #define  cpcolormat(md,ms)      bcopy((char *)ms,(char *)md,sizeof(COLORMAT))
200 < #else
201 < extern char  *memcpy();
202 < #define  cpcolormat(md,ms)      (void)memcpy((char *)md,(char *)ms,sizeof(COLORMAT))
198 > #define  rgb_cie(xyz,rgb)       colortrans(xyz,rgb2xyzmat,rgb)
199 >
200 > #define  cpcolormat(md,ms)      memcpy((void *)md,(void *)ms,sizeof(COLORMAT))
201 >
202 >                                        /* defined in color.c */
203 > extern char     *tempbuffer(unsigned int len);
204 > extern int      fwritecolrs(COLR *scanline, int len, FILE *fp);
205 > extern int      freadcolrs(COLR *scanline, int len, FILE *fp);
206 > extern int      fwritescan(COLOR *scanline, int len, FILE *fp);
207 > extern int      freadscan(COLOR *scanline, int len, FILE *fp);
208 > extern void     setcolr(COLR clr, double r, double g, double b);
209 > extern void     colr_color(COLOR col, COLR clr);
210 > extern int      bigdiff(COLOR c1, COLOR c2, double md);
211 >                                        /* defined in spec_rgb.c */
212 > extern void     spec_rgb(COLOR col, int s, int e);
213 > extern void     spec_cie(COLOR col, int s, int e);
214 > extern void     cie_rgb(COLOR rgb, COLOR xyz);
215 > extern int      clipgamut(COLOR col, double brt, int gamut,
216 >                                COLOR lower, COLOR upper);
217 > extern void     colortrans(COLOR c2, COLORMAT mat, COLOR c1);
218 > extern void     multcolormat(COLORMAT m3, COLORMAT m2,
219 >                                        COLORMAT m1);
220 > extern int      colorprimsOK(RGBPRIMS pr);
221 > extern int      compxyz2rgbmat(COLORMAT mat, RGBPRIMS pr);
222 > extern int      comprgb2xyzmat(COLORMAT mat, RGBPRIMS pr);
223 > extern int      comprgb2rgbmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
224 > extern int      compxyzWBmat(COLORMAT mat, float wht1[2],
225 >                                float wht2[2]);
226 > extern int      compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr);
227 > extern int      comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr);
228 > extern int      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