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.18 by greg, Sat Feb 22 02:07:22 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 + /* ====================================================================
14 + * The Radiance Software License, Version 1.0
15 + *
16 + * Copyright (c) 1990 - 2002 The Regents of the University of California,
17 + * through Lawrence Berkeley National Laboratory.   All rights reserved.
18 + *
19 + * Redistribution and use in source and binary forms, with or without
20 + * modification, are permitted provided that the following conditions
21 + * are met:
22 + *
23 + * 1. Redistributions of source code must retain the above copyright
24 + *         notice, this list of conditions and the following disclaimer.
25 + *
26 + * 2. Redistributions in binary form must reproduce the above copyright
27 + *       notice, this list of conditions and the following disclaimer in
28 + *       the documentation and/or other materials provided with the
29 + *       distribution.
30 + *
31 + * 3. The end-user documentation included with the redistribution,
32 + *           if any, must include the following acknowledgment:
33 + *             "This product includes Radiance software
34 + *                 (http://radsite.lbl.gov/)
35 + *                 developed by the Lawrence Berkeley National Laboratory
36 + *               (http://www.lbl.gov/)."
37 + *       Alternately, this acknowledgment may appear in the software itself,
38 + *       if and wherever such third-party acknowledgments normally appear.
39 + *
40 + * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
41 + *       and "The Regents of the University of California" must
42 + *       not be used to endorse or promote products derived from this
43 + *       software without prior written permission. For written
44 + *       permission, please contact [email protected].
45 + *
46 + * 5. Products derived from this software may not be called "Radiance",
47 + *       nor may "Radiance" appear in their name, without prior written
48 + *       permission of Lawrence Berkeley National Laboratory.
49 + *
50 + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
51 + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
52 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
53 + * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
54 + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
55 + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
56 + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
57 + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
58 + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
59 + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
60 + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
61 + * SUCH DAMAGE.
62 + * ====================================================================
63 + *
64 + * This software consists of voluntary contributions made by many
65 + * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
66 + * information on Lawrence Berkeley National Laboratory, please see
67 + * <http://www.lbl.gov/>.
68 + */
69 +
70 + #include <stdio.h>
71 + #include <stdlib.h>
72 +
73 + #ifdef __cplusplus
74 + extern "C" {
75 + #endif
76 +
77   #define  RED            0
78   #define  GRN            1
79   #define  BLU            2
# Line 23 | Line 84
84   #define  COLXS          128     /* excess used for exponent */
85   #define  WHT            3       /* used for RGBPRIMS type */
86  
87 < typedef unsigned char  BYTE;    /* 8-bit unsigned integer */
87 > #undef  BYTE
88 > #define  BYTE   unsigned char   /* 8-bit unsigned integer */
89  
90   typedef BYTE  COLR[4];          /* red, green, blue (or X,Y,Z), exponent */
91  
# Line 69 | Line 131 | typedef float  COLORMAT[3][3]; /* color coordinate con
131   #define  CIE_y_w                0.3333
132   #endif
133  
134 < #define  STDPRIMS       {CIE_x_r,CIE_y_r,CIE_x_g,CIE_y_g, \
135 <                                CIE_x_b,CIE_y_b,CIE_x_w,CIE_y_w}
134 > #define  STDPRIMS       {{CIE_x_r,CIE_y_r},{CIE_x_g,CIE_y_g}, \
135 >                                {CIE_x_b,CIE_y_b},{CIE_x_w,CIE_y_w}}
136  
137   #define CIE_D           (       CIE_x_r*(CIE_y_g - CIE_y_b) + \
138                                  CIE_x_g*(CIE_y_b - CIE_y_r) + \
# Line 174 | Line 236 | typedef float  COLORMAT[3][3]; /* color coordinate con
236   #define  fputcolcor(cc,fp)      fprintf(fp,"%s %f %f %f\n",COLCORSTR, \
237                                          (cc)[RED],(cc)[GRN],(cc)[BLU])
238  
177 #ifdef  DCL_ATOF
178 extern double  atof(), ldexp(), frexp();
179 #endif
180
239   /*
240   * Conversions to and from XYZ space generally don't apply WHTEFFICACY.
241   * If you need Y to be luminance (cd/m^2), this must be applied when
242   * converting from radiance (watts/sr/m^2).
243   */
244  
245 < extern RGBPRIMS  stdprims;              /* standard primary chromaticities */
246 < extern COLORMAT  rgb2xyzmat;            /* RGB to XYZ conversion matrix */
247 < extern COLORMAT  xyz2rgbmat;            /* XYZ to RGB conversion matrix */
245 > extern RGBPRIMS  stdprims;      /* standard primary chromaticities */
246 > extern COLORMAT  rgb2xyzmat;    /* RGB to XYZ conversion matrix */
247 > extern COLORMAT  xyz2rgbmat;    /* XYZ to RGB conversion matrix */
248 > extern COLOR  cblack, cwhite;   /* black (0,0,0) and white (1,1,1) */
249  
250 < #define  cie_rgb(rgb,xyz)       colortrans(rgb,xyz2rgbmat,xyz,1)
251 < #define  rgb_cie(xyz,rgb)       colortrans(xyz,rgb2xyzmat,rgb,1)
250 > #define  CGAMUT_LOWER           01
251 > #define  CGAMUT_UPPER           02
252 > #define  CGAMUT                 (CGAMUT_LOWER|CGAMUT_UPPER)
253  
254 + #define  rgb_cie(xyz,rgb)       colortrans(xyz,rgb2xyzmat,rgb)
255 +
256   #ifdef BSD
257   #define  cpcolormat(md,ms)      bcopy((char *)ms,(char *)md,sizeof(COLORMAT))
258   #else
259 < extern char  *memcpy();
260 < #define  cpcolormat(md,ms)      (void)memcpy((char *)md,(char *)ms,sizeof(COLORMAT))
259 > #define  cpcolormat(md,ms)      memcpy((char *)md,(char *)ms,sizeof(COLORMAT))
260 > #endif
261 >
262 > #ifdef NOPROTO
263 >                                        /* defined in color.c */
264 > extern char     *tempbuffer();
265 > extern int      fwritecolrs();
266 > extern int      freadcolrs();
267 > extern int      fwritescan();
268 > extern int      freadscan();
269 > extern void     setcolr();
270 > extern void     colr_color();
271 > extern int      bigdiff();
272 >                                        /* defined in spec_rgb.c */
273 > extern void     spec_rgb();
274 > extern void     spec_cie();
275 > extern void     cie_rgb();
276 > extern int      clipgamut();
277 > extern void     colortrans();
278 > extern void     multcolormat();
279 > extern void     compxyz2rgbmat();
280 > extern void     comprgb2xyzmat();
281 > extern void     comprgb2rgbmat();
282 > extern void     compxyzWBmat();
283 > extern void     compxyz2rgbWBmat();
284 > extern void     comprgb2xyzWBmat();
285 > extern void     comprgb2rgbWBmat();
286 >                                        /* defined in colrops.c */
287 > extern int      setcolrcor();
288 > extern int      setcolrinv();
289 > extern int      setcolrgam();
290 > extern int      colrs_gambs();
291 > extern int      gambs_colrs();
292 > extern void     shiftcolrs();
293 > extern void     normcolrs();
294 >
295 > #else
296 >                                        /* defined in color.c */
297 > extern char     *tempbuffer(unsigned int len);
298 > extern int      fwritecolrs(COLR *scanline, int len, FILE *fp);
299 > extern int      freadcolrs(COLR *scanline, int len, FILE *fp);
300 > extern int      fwritescan(COLOR *scanline, int len, FILE *fp);
301 > extern int      freadscan(COLOR *scanline, int len, FILE *fp);
302 > extern void     setcolr(COLR clr, double r, double g, double b);
303 > extern void     colr_color(COLOR col, COLR clr);
304 > extern int      bigdiff(COLOR c1, COLOR c2, double md);
305 >                                        /* defined in spec_rgb.c */
306 > extern void     spec_rgb(COLOR col, int s, int e);
307 > extern void     spec_cie(COLOR col, int s, int e);
308 > extern void     cie_rgb(COLOR rgb, COLOR xyz);
309 > extern int      clipgamut(COLOR col, double brt, int gamut,
310 >                                COLOR lower, COLOR upper);
311 > extern void     colortrans(COLOR c2, COLORMAT mat, COLOR c1);
312 > extern void     multcolormat(COLORMAT m3, COLORMAT m2,
313 >                                        COLORMAT m1);
314 > extern void     compxyz2rgbmat(COLORMAT mat, RGBPRIMS pr);
315 > extern void     comprgb2xyzmat(COLORMAT mat, RGBPRIMS pr);
316 > extern void     comprgb2rgbmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
317 > extern void     compxyzWBmat(COLORMAT mat, float wht1[2],
318 >                                float wht2[2]);
319 > extern void     compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr);
320 > extern void     comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr);
321 > extern void     comprgb2rgbWBmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
322 >                                        /* defined in colrops.c */
323 > extern int      setcolrcor(double (*f)(), double a2);
324 > extern int      setcolrinv(double (*f)(), double a2);
325 > extern int      setcolrgam(double g);
326 > extern int      colrs_gambs(COLR *scan, int len);
327 > extern int      gambs_colrs(COLR *scan, int len);
328 > extern void     shiftcolrs(COLR *scan, int len, int adjust);
329 > extern void     normcolrs(COLR *scan, int len, int adjust);
330 >
331 > #endif
332 >
333 > #ifdef __cplusplus
334 > }
335   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines