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.20 by greg, Tue May 13 17:58:32 2003 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   *
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
# Line 13 | Line 10
10   *  three single byte mantissas and a common exponent.
11   */
12  
13 + #include "copyright.h"
14 +
15 + #include <stdio.h>
16 + #include <stdlib.h>
17 +
18 + #ifdef __cplusplus
19 + extern "C" {
20 + #endif
21 +
22   #define  RED            0
23   #define  GRN            1
24   #define  BLU            2
# Line 23 | Line 29
29   #define  COLXS          128     /* excess used for exponent */
30   #define  WHT            3       /* used for RGBPRIMS type */
31  
32 < typedef unsigned char  BYTE;    /* 8-bit unsigned integer */
32 > #undef  BYTE
33 > #define  BYTE   unsigned char   /* 8-bit unsigned integer */
34  
35   typedef BYTE  COLR[4];          /* red, green, blue (or X,Y,Z), exponent */
36  
# 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 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,1)
196 < #define  rgb_cie(xyz,rgb)       colortrans(xyz,rgb2xyzmat,rgb,1)
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))
202 > #define  cpcolormat(md,ms)      bcopy((void *)ms,(void *)md,sizeof(COLORMAT))
203   #else
204 < extern char  *memcpy();
205 < #define  cpcolormat(md,ms)      (void)memcpy((char *)md,(char *)ms,sizeof(COLORMAT))
204 > #define  cpcolormat(md,ms)      memcpy((void *)md,(void *)ms,sizeof(COLORMAT))
205 > #endif
206 >
207 > #ifdef NOPROTO
208 >                                        /* defined in color.c */
209 > extern char     *tempbuffer();
210 > extern int      fwritecolrs();
211 > extern int      freadcolrs();
212 > extern int      fwritescan();
213 > extern int      freadscan();
214 > extern void     setcolr();
215 > extern void     colr_color();
216 > extern int      bigdiff();
217 >                                        /* defined in spec_rgb.c */
218 > extern void     spec_rgb();
219 > extern void     spec_cie();
220 > extern void     cie_rgb();
221 > extern int      clipgamut();
222 > extern void     colortrans();
223 > extern void     multcolormat();
224 > extern void     compxyz2rgbmat();
225 > extern void     comprgb2xyzmat();
226 > extern void     comprgb2rgbmat();
227 > extern void     compxyzWBmat();
228 > extern void     compxyz2rgbWBmat();
229 > extern void     comprgb2xyzWBmat();
230 > extern void     comprgb2rgbWBmat();
231 >                                        /* defined in colrops.c */
232 > extern int      setcolrcor();
233 > extern int      setcolrinv();
234 > extern int      setcolrgam();
235 > extern int      colrs_gambs();
236 > extern int      gambs_colrs();
237 > extern void     shiftcolrs();
238 > extern void     normcolrs();
239 >
240 > #else
241 >                                        /* defined in color.c */
242 > extern char     *tempbuffer(unsigned int len);
243 > extern int      fwritecolrs(COLR *scanline, int len, FILE *fp);
244 > extern int      freadcolrs(COLR *scanline, int len, FILE *fp);
245 > extern int      fwritescan(COLOR *scanline, int len, FILE *fp);
246 > extern int      freadscan(COLOR *scanline, int len, FILE *fp);
247 > extern void     setcolr(COLR clr, double r, double g, double b);
248 > extern void     colr_color(COLOR col, COLR clr);
249 > extern int      bigdiff(COLOR c1, COLOR c2, double md);
250 >                                        /* defined in spec_rgb.c */
251 > extern void     spec_rgb(COLOR col, int s, int e);
252 > extern void     spec_cie(COLOR col, int s, int e);
253 > extern void     cie_rgb(COLOR rgb, COLOR xyz);
254 > extern int      clipgamut(COLOR col, double brt, int gamut,
255 >                                COLOR lower, COLOR upper);
256 > extern void     colortrans(COLOR c2, COLORMAT mat, COLOR c1);
257 > extern void     multcolormat(COLORMAT m3, COLORMAT m2,
258 >                                        COLORMAT m1);
259 > extern void     compxyz2rgbmat(COLORMAT mat, RGBPRIMS pr);
260 > extern void     comprgb2xyzmat(COLORMAT mat, RGBPRIMS pr);
261 > extern void     comprgb2rgbmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
262 > extern void     compxyzWBmat(COLORMAT mat, float wht1[2],
263 >                                float wht2[2]);
264 > extern void     compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr);
265 > extern void     comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr);
266 > extern void     comprgb2rgbWBmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
267 >                                        /* defined in colrops.c */
268 > extern int      setcolrcor(double (*f)(), double a2);
269 > extern int      setcolrinv(double (*f)(), double a2);
270 > extern int      setcolrgam(double g);
271 > extern int      colrs_gambs(COLR *scan, int len);
272 > extern int      gambs_colrs(COLR *scan, int len);
273 > extern void     shiftcolrs(COLR *scan, int len, int adjust);
274 > extern void     normcolrs(COLR *scan, int len, int adjust);
275 >
276 > #endif
277 >
278 > #ifdef __cplusplus
279 > }
280   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines