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.39 by greg, Fri Nov 17 20:02:07 2023 UTC vs.
Revision 2.40 by greg, Tue Nov 21 01:30:20 2023 UTC

# Line 239 | Line 239 | typedef float  COLORMAT[3][3]; /* color coordinate con
239   #define  COLRFMT                "32-bit_rle_rgbe"
240   #define  CIEFMT                 "32-bit_rle_xyze"
241   #define  PICFMT                 "32-bit_rle_???e"       /* matches either */
242 < #define  SPECFMT                "Radiance_rle_spectra"  /* spectral data w/ exponent */
243 < #define  LPICFMT                21                      /* max format id len */
242 > #define  SPECFMT                "Radiance_spectra"      /* spectral data w/ exponent */
243  
244                                  /* Number of spectral components */
245   #define  NCOMPSTR               "NCOMP="
# Line 340 | Line 339 | extern void    convertscolor(SCOLOR dst, int dnc, double
339                                  /* compare scolor_rgb() and scolor_cie() */
340                                  /* also, pcolor_color() and pcolor_colr() */
341   extern void     setscolor(SCOLOR scol, double r, double g, double b);
342 < extern void     scolor2color(COLOR col, SCOLOR scol, int ncs, float wlpt[4]);
343 < extern void     scolor2colr(COLR clr, SCOLOR scol, int ncs, float wlpt[4]);
342 > extern void     scolor2color(COLOR col, SCOLOR scol, int ncs, const float wlpt[4]);
343 > extern void     scolor2colr(COLR clr, SCOLOR scol, int ncs, const float wlpt[4]);
344   extern void     scolor2scolr(SCOLR sclr, SCOLOR scol, int ncs);
345   extern void     colr_color(COLOR col, COLR clr);
346   extern void     scolr2scolor(SCOLOR scol, SCOLR sclr, int ncs);
347 < extern void     scolr2color(COLOR col, SCOLR sclr, int ncs, float wlpt[4]);
347 > extern void     scolr2color(COLOR col, SCOLR sclr, int ncs, const float wlpt[4]);
348   extern void     colr_scolor(SCOLOR scol, COLR clr);
349   extern void     setcolr(COLR clr, double r, double g, double b);
350   extern void     setscolr(SCOLR sclr, double r, double g, double b);
# Line 372 | Line 371 | extern int     compxyz2rgbWBmat(COLORMAT mat, RGBPRIMS pr)
371   extern int      comprgb2xyzWBmat(COLORMAT mat, RGBPRIMS pr);
372   extern int      comprgb2rgbWBmat(COLORMAT mat, RGBPRIMS pr1, RGBPRIMS pr2);
373                                          /* most accurate spectral->tristim */
374 < extern void     scolor2cie(COLOR col, SCOLOR scol, int ncs, float wlpt[4]);
375 < extern void     scolor2rgb(COLOR col, SCOLOR scol, int ncs, float wlpt[4]);
374 > extern void     scolor2cie(COLOR col, SCOLOR scol, int ncs, const float wlpt[4]);
375 > extern void     scolor2rgb(COLOR col, SCOLOR scol, int ncs, const float wlpt[4]);
376   extern double   scolor_photopic(SCOLOR scol);
377   extern double   scolor_scotopic(SCOLOR scol);
378   extern double   scolor_melanopic(SCOLOR scol);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines