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.18 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.36 by greg, Sat Mar 5 17:18:02 2022 UTC

# Line 1 | Line 1
1 < /* RCSid: $Id$ */
1 > /* RCSid $Id$ */
2   /*
3   *  color.h - header for routines using pixel color values.
4   *
5 *  Must be included after X11 headers, since they declare a BYTE type.
6 *
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 /* ====================================================================
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
13   #include <stdio.h>
14   #include <stdlib.h>
15  
# Line 84 | Line 27 | extern "C" {
27   #define  COLXS          128     /* excess used for exponent */
28   #define  WHT            3       /* used for RGBPRIMS type */
29  
30 < #undef  BYTE
31 < #define  BYTE   unsigned char   /* 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 111 | Line 55 | typedef float  COLORMAT[3][3]; /* color coordinate con
55  
56   #define  multcolor(c1,c2)       ((c1)[0]*=(c2)[0],(c1)[1]*=(c2)[1],(c1)[2]*=(c2)[2])
57  
58 < #ifdef  NTSC
58 > #if defined(NTSC_RGB)
59   #define  CIE_x_r                0.670           /* standard NTSC primaries */
60   #define  CIE_y_r                0.330
61   #define  CIE_x_g                0.210
62   #define  CIE_y_g                0.710
63   #define  CIE_x_b                0.140
64   #define  CIE_y_b                0.080
65 < #define  CIE_x_w                0.3333          /* use true white */
66 < #define  CIE_y_w                0.3333
65 > #define  CIE_x_w                (1./3.)         /* use EE white */
66 > #define  CIE_y_w                (1./3.)
67 > #elif defined(SHARP_RGB)
68 > #define  CIE_x_r                0.6898          /* "sharp" RGB primaries */
69 > #define  CIE_y_r                0.3206
70 > #define  CIE_x_g                0.0736
71 > #define  CIE_y_g                0.9003
72 > #define  CIE_x_b                0.1166
73 > #define  CIE_y_b                0.0374
74 > #define  CIE_x_w                (1./3.)         /* use EE white */
75 > #define  CIE_y_w                (1./3.)
76   #else
77   #define  CIE_x_r                0.640           /* nominal CRT primaries */
78   #define  CIE_y_r                0.330
# Line 127 | Line 80 | typedef float  COLORMAT[3][3]; /* color coordinate con
80   #define  CIE_y_g                0.600
81   #define  CIE_x_b                0.150
82   #define  CIE_y_b                0.060
83 < #define  CIE_x_w                0.3333          /* use true white */
84 < #define  CIE_y_w                0.3333
83 > #define  CIE_x_w                (1./3.)         /* use EE white */
84 > #define  CIE_y_w                (1./3.)
85   #endif
86  
87   #define  STDPRIMS       {{CIE_x_r,CIE_y_r},{CIE_x_g,CIE_y_g}, \
# Line 154 | Line 107 | typedef float  COLORMAT[3][3]; /* color coordinate con
107   #define CIE_gf          (CIE_y_g*CIE_C_gD/CIE_D)
108   #define CIE_bf          (CIE_y_b*CIE_C_bD/CIE_D)
109  
110 < /* As of 9-94, CIE_rf=.265074126, CIE_gf=.670114631 and CIE_bf=.064811243 */
110 > /* Default CIE_rf=.265074126, CIE_gf=.670114631 and CIE_bf=.064811243 */
111  
112   /***** The following definitions are valid for RGB colors only... *****/
113  
# Line 169 | Line 122 | typedef float  COLORMAT[3][3]; /* color coordinate con
122   #define  D65EFFICACY            203.            /* standard illuminant D65 */
123   #define  INCEFFICACY            160.            /* illuminant A (incand.) */
124   #define  SUNEFFICACY            208.            /* illuminant B (solar dir.) */
125 < #define  SKYEFFICACY            D65EFFICACY     /* skylight */
125 > #define  SKYEFFICACY            D65EFFICACY     /* skylight (should be 110) */
126   #define  DAYEFFICACY            D65EFFICACY     /* combined sky and solar */
127  
128   #define  luminance(col)         (WHTEFFICACY * bright(col))
# Line 213 | Line 166 | typedef float  COLORMAT[3][3]; /* color coordinate con
166   #define  PRIMARYSTR             "PRIMARIES="
167   #define  LPRIMARYSTR            10
168   #define  isprims(hl)            (!strncmp(hl,PRIMARYSTR,LPRIMARYSTR))
169 < #define  primsval(p,hl)         sscanf(hl+LPRIMARYSTR, \
169 > #define  primsval(p,hl)         (sscanf((hl)+LPRIMARYSTR, \
170                                          "%f %f %f %f %f %f %f %f", \
171                                          &(p)[RED][CIEX],&(p)[RED][CIEY], \
172                                          &(p)[GRN][CIEX],&(p)[GRN][CIEY], \
173                                          &(p)[BLU][CIEX],&(p)[BLU][CIEY], \
174 <                                        &(p)[WHT][CIEX],&(p)[WHT][CIEY])
174 >                                        &(p)[WHT][CIEX],&(p)[WHT][CIEY]) == 8)
175   #define  fputprims(p,fp)        fprintf(fp, \
176                                  "%s %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f\n",\
177                                          PRIMARYSTR, \
# Line 231 | Line 184 | typedef float  COLORMAT[3][3]; /* color coordinate con
184   #define  COLCORSTR              "COLORCORR="
185   #define  LCOLCORSTR             10
186   #define  iscolcor(hl)           (!strncmp(hl,COLCORSTR,LCOLCORSTR))
187 < #define  colcorval(cc,hl)       sscanf(hl+LCOLCORSTR,"%f %f %f", \
187 > #define  colcorval(cc,hl)       sscanf((hl)+LCOLCORSTR,"%f %f %f", \
188                                          &(cc)[RED],&(cc)[GRN],&(cc)[BLU])
189   #define  fputcolcor(cc,fp)      fprintf(fp,"%s %f %f %f\n",COLCORSTR, \
190                                          (cc)[RED],(cc)[GRN],(cc)[BLU])
# Line 253 | Line 206 | extern COLOR  cblack, cwhite;  /* black (0,0,0) and whi
206  
207   #define  rgb_cie(xyz,rgb)       colortrans(xyz,rgb2xyzmat,rgb)
208  
209 < #ifdef BSD
257 < #define  cpcolormat(md,ms)      bcopy((char *)ms,(char *)md,sizeof(COLORMAT))
258 < #else
259 < #define  cpcolormat(md,ms)      memcpy((char *)md,(char *)ms,sizeof(COLORMAT))
260 < #endif
209 > #define  cpcolormat(md,ms)      memcpy((void *)md,(void *)ms,sizeof(COLORMAT))
210  
262 #ifdef NOPROTO
211                                          /* defined in color.c */
212 < 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);
212 > extern void     *tempbuffer(unsigned int len);
213   extern int      fwritecolrs(COLR *scanline, int len, FILE *fp);
214   extern int      freadcolrs(COLR *scanline, int len, FILE *fp);
215   extern int      fwritescan(COLOR *scanline, int len, FILE *fp);
# Line 311 | Line 226 | extern int     clipgamut(COLOR col, double brt, int gamut,
226   extern void     colortrans(COLOR c2, COLORMAT mat, COLOR c1);
227   extern void     multcolormat(COLORMAT m3, COLORMAT m2,
228                                          COLORMAT m1);
229 < extern void     compxyz2rgbmat(COLORMAT mat, RGBPRIMS pr);
230 < extern void     comprgb2xyzmat(COLORMAT mat, RGBPRIMS pr);
231 < extern void     comprgb2rgbmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
232 < extern void     compxyzWBmat(COLORMAT mat, float wht1[2],
229 > extern int      colorprimsOK(RGBPRIMS pr);
230 > extern int      compxyz2rgbmat(COLORMAT mat, RGBPRIMS pr);
231 > extern int      comprgb2xyzmat(COLORMAT mat, RGBPRIMS pr);
232 > extern int      comprgb2rgbmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
233 > extern int      compxyzWBmat(COLORMAT mat, float wht1[2],
234                                  float wht2[2]);
235 < extern void     compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr);
236 < extern void     comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr);
237 < extern void     comprgb2rgbWBmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
235 > extern int      compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr);
236 > extern int      comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr);
237 > extern int      comprgb2rgbWBmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
238                                          /* defined in colrops.c */
239 < extern int      setcolrcor(double (*f)(), double a2);
240 < extern int      setcolrinv(double (*f)(), double a2);
239 > extern int      setcolrcor(double (*f)(double, double), double a2);
240 > extern int      setcolrinv(double (*f)(double, double), double a2);
241   extern int      setcolrgam(double g);
242   extern int      colrs_gambs(COLR *scan, int len);
243   extern int      gambs_colrs(COLR *scan, int len);
244   extern void     shiftcolrs(COLR *scan, int len, int adjust);
245   extern void     normcolrs(COLR *scan, int len, int adjust);
246  
331 #endif
247  
248   #ifdef __cplusplus
249   }
250   #endif
251 + #endif /* _RAD_COLOR_H_ */
252 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines