Address comments, update docs to discourage using "sRGB" colorspace

Signed-off-by: Brecht Van Lommel <[email protected]>

Author: brechtvl

src/doc/builtinplugins.rst

@@ -60,7 +60,8 @@ tiles.
      - Version of the BMP file format
    * - ``oiio:ColorSpace``
      - string
-     - currently, it is always ``"sRGB"`` (we presume all BMP files are sRGB)
+     - currently, it is always ``"srgb_rec709_display"`` or
+       ``"srgb_rec709_scene"`` (we presume all BMP files are sRGB)
 
 **Configuration settings for BMP input**
 

src/doc/imagebufalgo.rst

@@ -2849,12 +2849,14 @@ Color space conversion
        .. code-tab:: c++
 
           ImageBuf Src ("tahoe.jpg");
-          ImageBuf Dst = ImageBufAlgo::colorconvert (Src, "sRGB", "acescg", true);
+          ImageBuf Dst = ImageBufAlgo::colorconvert (Src, "srgb_rec709_scene",
+                                                     "acescg", true);
 
        .. code-tab:: py
 
           Src = ImageBuf("tahoe.jpg")
-          Dst = ImageBufAlgo.colorconvert (Src, "sRGB", "acescg", True)
+          Dst = ImageBufAlgo.colorconvert (Src, "srgb_rec709_scene", "acescg",
+                                           True)
 
        .. code-tab:: bash oiiotool
 
@@ -2950,14 +2952,15 @@ Color space conversion
        .. code-tab:: c++
 
           ImageBuf Src ("tahoe.exr");
-          ImageBuf Dst = ImageBufAlgo::ociodisplay (Src, "sRGB", "Film", "lnf",
-                                                    "", true, "SHOT", "pe0012");
+          ImageBuf Dst = ImageBufAlgo::ociodisplay (Src, "srgb_rec709_scene",
+                                                    "Film", "lnf", "", true,
+                                                    "SHOT", "pe0012");
 
        .. code-tab:: py
 
           Src = ImageBuf("tahoe.jpg")
-          Dst = ImageBufAlgo.ociodisplay (Src, "sRGB", "Film", "lnf",
-                                          "", True, "SHOT", "pe0012")
+          Dst = ImageBufAlgo.ociodisplay (Src, "srgb_rec709_scene", "Film",
+                                          "lnf", "", True, "SHOT", "pe0012")
 
        .. code-tab:: bash oiiotool
 

src/doc/pythonbindings.rst

@@ -3610,7 +3610,8 @@ Color manipulation
     .. code-block:: python
 
         Src = ImageBuf ("tahoe.jpg")
-        Dst = ImageBufAlgo.colorconvert (Src, "sRGB", "scene_linear")
+        Dst = ImageBufAlgo.colorconvert (Src, "srgb_rec709_scene",
+                                         "scene_linear")
 
 
 
@@ -3660,7 +3661,7 @@ Color manipulation
     .. code-block:: python
 
         Src = ImageBuf ("tahoe.exr")
-        Dst = ImageBufAlgo.ociodisplay (Src, "sRGB", "Film", "lnf",
+        Dst = ImageBufAlgo.ociodisplay (Src, "srgb_rec709_scene", "Film", "lnf",
                                   context_key="SHOT", context_value="pe0012")
 
 

src/doc/stdmetadata.rst

@@ -150,7 +150,8 @@ Color information
     - `"lin_ap0_scene"` :  ACES2065-1, the recommended ACES space for
       interchange and archiving.
     - `"srgb_rec709_display"` : Using standard (piecewise) sRGB response and
-      primaries. The token `"sRGB"` is treated as a synonym.
+      primaries. The token `"sRGB"` is treated as a synonym, but it is
+      recommended to use the more specific interop ID.
     - `"srgb_rec709_scene"` : Same response and primaries as
       `"srgb_rec709_display"` but for scene referred images.
     - `"g22_rec709_display"` : Rec709/sRGB primaries, but using a response curve

src/include/OpenImageIO/imageio.h

@@ -912,10 +912,10 @@ class OIIO_API ImageSpec {
     /// 1. Assigning to the delegate adds a metadata attribute:
     ///
     ///        ImageSpec spec;
-    ///        spec["foo"] = 42;                   // int
-    ///        spec["pi"] = float(M_PI);           // float
-    ///        spec["oiio:ColorSpace"] = "sRGB";   // string
-    ///        spec["cameratoworld"] = Imath::Matrix44(...);  // matrix
+    ///        spec["foo"] = 42;                                  // int
+    ///        spec["pi"] = float(M_PI);                          // float
+    ///        spec["oiio:ColorSpace"] = "srgb_rec709_display";   // string
+    ///        spec["cameratoworld"] = Imath::Matrix44(...);      // matrix
     ///
     ///    Be very careful, the attribute's type will be implied by the C++
     ///    type of what you assign.

src/libOpenImageIO/color_ocio.cpp

@@ -2100,7 +2100,8 @@ struct ColorInteropID {
 // Mapping between color interop ID and CICP, based on Color Interop Forum
 // recommendations.
 constexpr ColorInteropID color_interop_ids[] = {
-    // Display referred interop IDs.
+    // Display referred interop IDs first so they are the default in automatic.
+    // conversion from CICP to interop ID.
     { "srgb_rec709_display", CICPPrimaries::Rec709, CICPTransfer::sRGB,
       CICPMatrix::BT709 },
     // Not all software interprets this CICP the same, see the
@@ -2137,9 +2138,9 @@ constexpr ColorInteropID color_interop_ids[] = {
     { "ocio:lin_ciexyzd65_display", CICPPrimaries::XYZD65, CICPTransfer::Linear,
       CICPMatrix::Unspecified },
 
-    // Scene referred interop IDs first so they are the default in automatic
-    // conversion from CICP to interop ID. Some are not display color spaces
-    // at all, but can be represented by CICP anyway.
+    // Scene referred interop IDs. These have CICPs even if it can be argued
+    // those are only meant for display color spaces. It still improves interop
+    // with other software that does not care about the distinction.
     { "lin_ap1_scene" },
     { "lin_ap0_scene" },
     { "lin_rec709_scene", CICPPrimaries::Rec709, CICPTransfer::Linear,
@@ -2199,7 +2200,7 @@ string_view
 ColorConfig::get_color_interop_id(const int cicp[4],
                                   const string_view prefer_image_state) const
 {
-    string_view other_interop_id;
+    string_view other_interop_id = "";
     for (const ColorInteropID& interop : color_interop_ids) {
         if (interop.has_cicp && interop.cicp[0] == cicp[0]
             && interop.cicp[1] == cicp[1]) {

src/raw.imageio/rawinput.cpp

@@ -578,8 +578,7 @@ RawInput::open_raw(bool unpack, bool process, const std::string& name,
         m_processor->imgdata.params.gamm[0]      = 1.0;
         m_processor->imgdata.params.gamm[1]      = 1.0;
     } else if (cs.empty() || colorconfig.equivalent(cs, "srgb_rec709_display")
-               || colorconfig.equivalent(cs, "srgb_rec709_scene")
-               || Strutil::iequals(cs, "sRGB") /* Necessary? */) {
+               || colorconfig.equivalent(cs, "srgb_rec709_scene")) {
         // Request explicit sRGB, including usual sRGB response
         m_processor->imgdata.params.output_color = 1;
         m_processor->imgdata.params.gamm[0]      = 1.0 / 2.4;
@@ -589,7 +588,7 @@ RawInput::open_raw(bool unpack, bool process, const std::string& name,
                || Strutil::iequals(cs, "lin_srgb")
                || Strutil::iequals(cs, "lin_rec709")
                || Strutil::iequals(cs, "linear") /* DEPRECATED */) {
-        // Request "sRGB" primaries, linear response
+        // Request sRGB primaries, linear response
         m_processor->imgdata.params.output_color = 1;
         m_processor->imgdata.params.gamm[0]      = 1.0;
         m_processor->imgdata.params.gamm[1]      = 1.0;