diff --git a/css-color-4/Overview.bs b/css-color-4/Overview.bs index b8757467da33..34261b7de22d 100644 --- a/css-color-4/Overview.bs +++ b/css-color-4/Overview.bs @@ -6052,9 +6052,7 @@ Sample Pseudocode for the Ray Trace Gamut Mapping

-
1. if |origin| is in gamut for |destination|, - convert |origin| to |destination| and return it as the gamut mapped color -
+
2. if |destination| has no gamut limits (XYZ-D65, XYZ-D50, Lab, LCH, Oklab, OkLCh) convert |origin| to |destination| and return it as the gamut mapped color
3. let |origin_OkLCh| be |origin| converted from |origin color space| to the OkLCh color space
@@ -6071,45 +6069,51 @@ Sample Pseudocode for the Ray Trace Gamut Mapping
4. let |origin_rgb| be |origin_OkLCh| converted to the linear-light form of |destination|
-
5. let |low| be 1E-6 ¹
-
6. let |high| be 1.0 - |low| ²
-
7. let |last| be |origin_rgb|
-
8. for (i=0; i<4; i++) + +
9. if |origin_rgb| is not in gamut
   -
   • if (i > 0) + +
   • let |low| be 0.0 + 1E-6 ¹
   +
   • let |high| be 1.0 - 1E-6 ²
   +
   • let |last| be |origin_rgb|
   +
   • for (i=0; i<4; i++)
     -
     • let |current_OkLCh| be |origin_rgb| converted to OkLCh
     -
     • let the lightness of |current_OkLCh| be |l_origin|
     -
     • let the hue of |current_OkLCh| be |h_origin| - ³
     -
     • let |origin_rgb| be |current_OkLCh| - converted to the linear-light form of |destination| +
     • if (i > 0) +
       +
       • let |current_OkLCh| be |origin_rgb| converted to OkLCh
       +
       • let the lightness of |current_OkLCh| be |l_origin|
       +
       • let the hue of |current_OkLCh| be |h_origin| + ³
       +
       • let |origin_rgb| be |current_OkLCh| + converted to the linear-light form of |destination| +
       +
       +
     +
     • Cast a ray from |anchor| to |origin_rgb| + and let |intersection| be + the intersection of this ray + with the gamut boundary
     +
     • if an intersection was not found, + let |origin_rgb| be |last| and exit the loop + ⁵ +
     +
     • if (i >0) AND (each component of |origin_rgb| is between |low| and |high|) then + let |anchor| be |origin_rgb| + ⁴ +
     +
     • let |origin_rgb| be |intersection|
     +
     • let |last| be |intersection|
   -
   • Cast a ray from |anchor| to |origin_rgb| - and let |intersection| be - the intersection of this ray - with the gamut boundary -
   -
   • if an intersection was not found, - let |origin_rgb| be |last| and exit the loop - ⁵ -
   -
   • if (i >0) AND (each component of |origin_rgb| is between |low| and |high|) then - let |anchor| be |origin_rgb| - ⁴ -
   -
   • let |origin_rgb| be |intersection|
   -
   • let |last| be |intersection|
- -
10. let |clipped| be |origin_rgb| clipped to gamut (components in range 0 to 1), - thus trimming off any noise due to floating point inaccuracy -
-
11. return |clipped|, converted to |destination| as the gamut mapped color
- + +
12. let clip(|color|) be a function which converts |color| to |destination|, + clamps each component to the bounds of the reference range for that component + and returns the result
+
13. set |clipped| to clip(|current|)
+
14. return |clipped| as the gamut mapped color

@@ -6135,7 +6139,7 @@ Sample Pseudocode for the Ray Trace Gamut Mapping

let |d| be |b| - |a|

let |direction|[i] be |d|

-

if (d != 0): +

if abs(|d|) < 1E-12

• let |inv_d| be 1 / |d|
• let |t1| be (|bmin|[i] - |a|) * |inv_d|
@@ -6165,7 +6169,7 @@ Sample Pseudocode for the Ray Trace Gamut Mapping

-

if (|tnear| > 10) +

if |tnear| is infinite (or matches the initial very large value)

• return INTERSECTION NOT FOUND