Update colour.XYZ_to_RGB and colour.RGB_to_XYZ definition signatu…

…res. References #1127
colour-science · Mar 31, 2023 · efe56ea · efe56ea
1 parent be836ad
commit efe56ea
Show file tree

Hide file tree

Showing 13 changed files with 309 additions and 203 deletions.
diff --git a/colour/characterisation/aces_it.py b/colour/characterisation/aces_it.py
@@ -270,12 +270,7 @@ def k(x: NDArrayFloat, y: NDArrayFloat) -> DTypeFloat:
             NPM,
             chromatic_adaptation_transform,
         )
-        E_rgb = XYZ_to_RGB(
-            XYZ,
-            RGB_COLOURSPACE_ACES2065_1.whitepoint,
-            RGB_COLOURSPACE_ACES2065_1.whitepoint,
-            RGB_COLOURSPACE_ACES2065_1.matrix_XYZ_to_RGB,
-        )
+        E_rgb = XYZ_to_RGB(XYZ, RGB_COLOURSPACE_ACES2065_1)
 
     return from_range_1(E_rgb)
 
@@ -864,9 +859,10 @@ def matrix_idt(
     | str
     | None = "CAT02",
     additional_data: bool = False,
-) -> Tuple[NDArrayFloat, NDArrayFloat, NDArrayFloat, NDArrayFloat] | Tuple[
-    NDArrayFloat, NDArrayFloat
-]:
+) -> (
+    Tuple[NDArrayFloat, NDArrayFloat, NDArrayFloat, NDArrayFloat]
+    | Tuple[NDArrayFloat, NDArrayFloat]
+):
     """
     Compute an *Input Device Transform* (IDT) matrix for given camera *RGB*
     spectral sensitivities, illuminant, training data, standard observer colour

diff --git a/colour/examples/characterisation/examples_colour_checkers.py b/colour/examples/characterisation/examples_colour_checkers.py
@@ -36,11 +36,10 @@
 for name, xyY in data.items():
     RGB = colour.XYZ_to_RGB(
         colour.xyY_to_XYZ(xyY),
+        colour.RGB_COLOURSPACES["sRGB"],
         illuminant,
-        colour.CCS_ILLUMINANTS["CIE 1931 2 Degree Standard Observer"]["D65"],
-        colour.RGB_COLOURSPACES["sRGB"].matrix_XYZ_to_RGB,
         "Bradford",
-        colour.RGB_COLOURSPACES["sRGB"].cctf_encoding,
+        apply_cctf_encoding=True,
     )
 
     RGB_i = [int(round(x * 255)) if x >= 0 else 0 for x in np.ravel(RGB)]

diff --git a/colour/examples/models/examples_models.py b/colour/examples/models/examples_models.py
@@ -67,12 +67,7 @@
 D65 = colour.CCS_ILLUMINANTS["CIE 1931 2 Degree Standard Observer"]["D65"]
 print(
     colour.XYZ_to_RGB(
-        XYZ,
-        D65,
-        colour.RGB_COLOURSPACES["sRGB"].whitepoint,
-        colour.RGB_COLOURSPACES["sRGB"].matrix_XYZ_to_RGB,
-        "Bradford",
-        colour.RGB_COLOURSPACES["sRGB"].cctf_encoding,
+        XYZ, colour.RGB_COLOURSPACES["sRGB"], D65, "Bradford", True
     )
 )
 
@@ -85,12 +80,7 @@
 )
 print(
     colour.RGB_to_XYZ(
-        RGB,
-        colour.RGB_COLOURSPACES["sRGB"].whitepoint,
-        D65,
-        colour.RGB_COLOURSPACES["sRGB"].matrix_RGB_to_XYZ,
-        "Bradford",
-        colour.RGB_COLOURSPACES["sRGB"].cctf_decoding,
+        RGB, colour.RGB_COLOURSPACES["sRGB"], D65, "Bradford", True
     )
 )
 

diff --git a/colour/graph/conversion.py b/colour/graph/conversion.py
@@ -756,22 +756,12 @@ def mired_to_CCT_D_uv(mired: ArrayLike) -> NDArrayFloat:
     (
         "CIE XYZ",
         "RGB",
-        partial(
-            XYZ_to_RGB,
-            illuminant_XYZ=_RGB_COLOURSPACE_DEFAULT.whitepoint,
-            illuminant_RGB=_RGB_COLOURSPACE_DEFAULT.whitepoint,
-            matrix_XYZ_to_RGB=_RGB_COLOURSPACE_DEFAULT.matrix_XYZ_to_RGB,
-        ),
+        partial(XYZ_to_RGB, colourspace=_RGB_COLOURSPACE_DEFAULT),
     ),
     (
         "RGB",
         "CIE XYZ",
-        partial(
-            RGB_to_XYZ,
-            illuminant_RGB=_RGB_COLOURSPACE_DEFAULT.whitepoint,
-            illuminant_XYZ=_RGB_COLOURSPACE_DEFAULT.whitepoint,
-            matrix_RGB_to_XYZ=_RGB_COLOURSPACE_DEFAULT.matrix_RGB_to_XYZ,
-        ),
+        partial(RGB_to_XYZ, colourspace=_RGB_COLOURSPACE_DEFAULT),
     ),
     (
         "RGB",

diff --git a/colour/models/rgb/common.py b/colour/models/rgb/common.py
@@ -89,15 +89,12 @@ def XYZ_to_sRGB(
     array([ 0.7057393...,  0.1924826...,  0.2235416...])
     """
 
-    sRGB = RGB_COLOURSPACES["sRGB"]
-
     return XYZ_to_RGB(
         XYZ,
+        RGB_COLOURSPACES["sRGB"],
         illuminant,
-        sRGB.whitepoint,
-        sRGB.matrix_XYZ_to_RGB,
         chromatic_adaptation_transform,
-        sRGB.cctf_encoding if apply_cctf_encoding else None,
+        apply_cctf_encoding,
     )
 
 

diff --git a/colour/models/rgb/ictcp.py b/colour/models/rgb/ictcp.py
@@ -519,13 +519,10 @@ def XYZ_to_ICtCp(
     array([ 0.5924279..., -0.0374073...,  0.2512267...])
     """
 
-    BT2020 = RGB_COLOURSPACES["ITU-R BT.2020"]
-
     RGB = XYZ_to_RGB(
         XYZ,
+        RGB_COLOURSPACES["ITU-R BT.2020"],
         illuminant,
-        BT2020.whitepoint,
-        BT2020.matrix_XYZ_to_RGB,
         chromatic_adaptation_transform,
     )