[ViewVC] Diff of: radiance/ray/src/common/spec

Comparing ray/src/common/spec_rgb.c (file contents):
Revision 2.32 by greg, Wed Jan 17 17:36:20 2024 UTC vs.
Revision 2.33 by greg, Mon Aug 12 18:57:00 2024 UTC

-+
+void
-+
+scolor_out(                     /* prepare (spectral) color for output */
-+
+        COLORV *cout,
-+
+        RGBPRIMP primp,
-+
+        SCOLOR cres
-+
+)
-+
+{
-+
+        static COLORMAT xyz2myp;
-+
+        static RGBPRIMP lastp = NULL;
-+
-+
+        if (!primp) {                   /* output is spectral */
-+
+                copyscolor(cout, cres);
-+
+        } else if (primp == stdprims) { /* output is standard RGB */
-+
+                scolor_rgb(cout, cres);
-+
+        } else if (primp == xyzprims) { /* output is XYZ */
-+
+                scolor_cie(cout, cres);
-+
+                scalecolor(cout, WHTEFFICACY);
-+
+        } else if (NCSAMP > 3) {        /* spectral -> custom RGB */
-+
+                COLOR   xyz;
-+
+                if (lastp != primp)
-+
+                        compxyz2rgbWBmat(xyz2myp, lastp=primp);
-+
+                scolor_cie(xyz, cres);
-+
+                colortrans(cout, xyz2myp, xyz);
-+
+                clipgamut(cout, xyz[CIEY], CGAMUT_LOWER, cblack, cwhite);
-+
+        } else {                        /* else copy unknown RGB */
-+
+                copycolor(cout, cres);
-+
+        }
-+
+}
-+
-+
+double
+scolor2photopic(                /* compute scotopic integral for spectral color */
+        SCOLOR  scol,

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