Merge branch 'main' into feature/add_rgba_for_metal

Author: wRosie

.readthedocs.yml

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenColorIO Project.
+
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
+
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3.9"
+
+sphinx:
+  configuration: docs/conf.py
+
+formats:
+  - pdf
+  - htmlzip
+
+python:
+  install:
+    - requirements: docs/requirements.txt

docs/concepts/overview/introduction.rst

@@ -17,8 +17,8 @@ high fidelity color imaging in modern computer graphics. This section introduces
 those concepts and general workflow practices. Additional information can be
 found in Jeremy Selan's Cinematic Color `document <http://cinematiccolor.org/>`_.
 
-While OCIO is a color management library, it's only knowledge of color science
-comes from it's execution of the transforms defined in the OCIO configuration
+While OCIO is a color management library, its only knowledge of color science
+comes from its execution of the transforms defined in the OCIO configuration
 file. These transforms are either defined by the end user in a custom OCIO
 config or inherited from the publicly available configs.
 

docs/site/homepage/data/en/supported_apps.yml

@@ -14,8 +14,8 @@ supported_apps:
     - name : Adobe After Effects
       image : images/supported_apps/ae.png
       categories : ["2D", "Compositing", "Animation"]
-      content : Plugin required.
-      link : "http://fnordware.blogspot.com/2012/05/opencolorio-for-after-effects.html"
+      content : Native support.
+      link : "https://helpx.adobe.com/after-effects/using/opencolorio-aces-color-management.html"
 
     # portfolio item loop
     - name : Anchorpoint
@@ -161,8 +161,8 @@ supported_apps:
     - name : Adobe Photoshop
       image : images/supported_apps/ps.png
       categories : ["2D", "Photography", "Paint"]
-      content : Plugin required.
-      link : "http://fnordware.blogspot.com/2017/02/opencolorio-for-photoshop.html"
+      content : Beta support.
+      link : "https://community.adobe.com/t5/photoshop-beta-discussions/new-feature-opencolorio-and-32-bit-editing-now-available-in-photoshop-beta/m-p/14787280"
 
       # portfolio item loop
     - name : PhotoFlow

include/OpenColorIO/OpenColorIO.h

@@ -12,6 +12,7 @@
 #include <string>
 #include <fstream>
 #include <vector>
+#include <cstdint>
 
 #include "OpenColorABI.h"
 #include "OpenColorTypes.h"

share/dev/windows/ocio.bat

@@ -22,8 +22,8 @@ set INSTALL_PATH_OK=n
 rem Python location
 set PYTHON_PATH=
 
-rem Microsoft Visual Studio path
-set MSVS_PATH=%programfiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build
+rem Microsoft Visual Studio path (will auto-find if not passed in cmd args)
+set MSVS_PATH=
 
 set DO_CONFIGURE=0
 
@@ -75,6 +75,22 @@ if NOT "%~1"=="" (
     goto :args_loop
 )
 
+rem If not overridden by the cmd line args, find and use the latest Visual Studio
+if NOT DEFINED MSVS_PATH (
+    for /f %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -format value -property installationPath -latest') do (
+        echo Found Visual Studio installation at '%%i'
+        set MSVS_PATH=%%i
+    )
+)
+
+IF NOT EXIST "!MSVS_PATH!" ( 
+    echo Could not find MS Visual Studio. Please provide the location for Microsoft Visual Studio vcvars64.bat or modify MSVS_PATH in the script.
+    rem The double dash are in quote here because otherwise the echo command thow an error.
+    echo "--msvs <path>"
+    echo E.g. C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+    exit /b
+)
+
 rem Testing the path before cmake
 IF NOT EXIST "!VCPKG_PATH!" ( 
     echo Could not find Vcpkg. Please provide the location for vcpkg or modify VCPKG_PATH in this script.
@@ -103,14 +119,6 @@ if NOT EXIST "!PYTHON_PATH!\python.exe" (
     )
 )
 
-IF NOT EXIST "!MSVS_PATH!" ( 
-    echo Could not find MS Visual Studio. Please provide the location for Microsoft Visual Studio vcvars64.bat or modify MSVS_PATH in the script.
-    rem The double dash are in quote here because otherwise the echo command thow an error.
-    echo "--msvs <path>"
-    echo E.g. C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build
-    exit /b
-)
-
 if !CUSTOM_BUILD_PATH!==0 (
     echo.
     set /p BUILD_PATH_OK=Default build path [!BUILD_PATH!] is used. Is it ok? [y/n]:
@@ -139,7 +147,7 @@ set INSTALL_PATH=!INSTALL_PATH!\!CMAKE_BUILD_TYPE!
 
 rem ****************************************************************************************************************
 rem Setting up the environment using MS Visual Studio batch script
-set VCVARS64_PATH="!MSVS_PATH!\vcvars64.bat"
+set VCVARS64_PATH="!MSVS_PATH!\VC\Auxiliary\Build\vcvars64.bat"
 IF NOT EXIST !VCVARS64_PATH! (
     rem Checking for vcvars64.bat script.
     rem !MSVS_PATH! is checked earlier in the script
@@ -295,8 +303,8 @@ echo.
 echo Optional options depending on the environment:
 echo --python       Python installation location
 echo.
-echo --msvs         path where to find vcvars64.bat from Microsoft Visual Studio
-echo                Default: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build
+echo --msvs         Root folder of the Microsoft Visual Studio. (E.g. C:\Program Files\Microsoft Visual Studio\2022)
+echo                Default: installation path of the latest Visual Studio found in the system by the vswhere.exe tool.
 echo.
 echo --b            build location
 echo                Default: %TEMP%\OCIO\build

share/dev/windows/ocio_deps.bat

@@ -104,16 +104,14 @@ if ErrorLevel 1 (
 )
 
 echo Checking for Microsoft Visual Studio...
-set MSVS=0
-for /d %%a in ("%programfiles%\Microsoft Visual Studio*") do (
-    for /f "tokens=3 delims=\" %%x in ("%%a") do set MSVS=1
+set MSVS_PATH=
+for /f %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -format value -property installationPath -latest') do (
+    echo Found Visual Studio installation at '%%i'
+    set MSVS_PATH=%%i
 )
 
-if !MSVS!==0 (
-    echo No Microsoft Visual Studio installation was found in !programfiles!.
-    echo For non-standard installation path, please use the following option:
-    rem The double dash are in quote here because otherwise the echo command thow an error. 
-    echo "ocio_deps --vs <path>"
+if NOT EXIST !MSVS_PATH! (
+    echo No Microsoft Visual Studio installation was found in the system.
     exit /b
 )
 

src/OpenColorIO/FileRules.cpp

@@ -62,7 +62,7 @@ std::string ConvertToRegularExpression(const char * globPattern, bool ignoreCase
 
     if (ignoreCase)
     {
-        const size_t length = strlen(globPattern);
+        const size_t length = std::strlen(globPattern);
         bool respectCase = false;
         for (size_t i = 0; i < length; ++i)
         {

src/OpenColorIO/NamedTransform.cpp

@@ -244,16 +244,16 @@ std::ostream & operator<< (std::ostream & os, const NamedTransform & t)
     const auto numAliases = t.getNumAliases();
     if (numAliases == 1)
     {
-        os << "alias= " << t.getAlias(0) << ", ";
+        os << ", alias= " << t.getAlias(0);
     }
     else if (numAliases > 1)
     {
-        os << "aliases=[" << t.getAlias(0);
+        os << ", aliases=[" << t.getAlias(0);
         for (size_t aidx = 1; aidx < numAliases; ++aidx)
         {
             os << ", " << t.getAlias(aidx);
         }
-        os << "], ";
+        os << "]";
     }
     const std::string strFamily{ t.getFamily() };
     if (!strFamily.empty())

src/OpenColorIO/ops/lut1d/Lut1DOpGPU.cpp

@@ -258,7 +258,7 @@ void GetLut1DGPUShaderProgram(GpuShaderCreatorRcPtr & shaderCreator,
             {
                 static const float NEG_MIN_EXP = 15.0f;
                 static const float EXP_SCALE = 1024.0f;
-                static const float HALF_DENRM_MAX = 6.09755515e-05f;  // e.g. 2^-14 - 2^-24
+                static const float INV_DENRM_STEP = 16777216.0f;  // 1 / 2^-24
 
                 ss.newLine() << "float dep;";
                 ss.newLine() << "float abs_f = abs(f);";
@@ -282,15 +282,15 @@ void GetLut1DGPUShaderProgram(GpuShaderCreatorRcPtr & shaderCreator,
                 ss.newLine() << "else";
                 ss.newLine() << "{";
                 ss.indent();
-                // Extract bits from denormalized values
-                ss.newLine() << "dep = abs_f * 1023.0 / " << HALF_DENRM_MAX << ";";
+                // Extract bits from denormalized values.
+                ss.newLine() << "dep = abs_f * " << INV_DENRM_STEP << ";";
                 ss.dedent();
                 ss.newLine() << "}";
 
-                // Adjust position for negative values
-                ss.newLine() << "dep += step(f, 0.0) * 32768.0;";
+                // Adjust position for negative values.
+                ss.newLine() << "dep += (f < 0.) ? 32768.0 : 0.0;";
 
-                // At this point 'dep' contains the raw half
+                // At this point 'dep' contains the raw half.
                 // Note: Raw halfs for NaN floats cannot be computed using
                 //       floating-point operations.
             }

tests/cpu/Processor_tests.cpp

@@ -12,7 +12,7 @@
 namespace OCIO = OCIO_NAMESPACE;
 
 
-OCIO_ADD_TEST(Processor, basic)
+OCIO_ADD_TEST(Processor, basic_cache)
 {
     OCIO::ConfigRcPtr config = OCIO::Config::Create();
     OCIO::GroupTransformRcPtr group = OCIO::GroupTransform::Create();
@@ -56,6 +56,36 @@ OCIO_ADD_TEST(Processor, basic)
     OCIO_CHECK_EQUAL(std::string(processorMat->getCacheID()), "1b1880136f7669351adb0dcae0f4f9fd");
 }
 
+OCIO_ADD_TEST(Processor, basic_cache_lut)
+{
+    OCIO::ConfigRcPtr config = OCIO::Config::Create();
+    OCIO::GroupTransformRcPtr group = OCIO::GroupTransform::Create();
+
+    auto processorEmptyGroup = config->getProcessor(group);
+    OCIO_CHECK_EQUAL(processorEmptyGroup->getNumTransforms(), 0);
+    OCIO_CHECK_EQUAL(std::string(processorEmptyGroup->getCacheID()), "<NOOP>");
+
+    auto lut = OCIO::Lut3DTransform::Create(3);
+    // Make sure it's not an identity.
+    lut->setValue(2, 2, 2, 2.f, 3.f, 4.f);
+
+    auto processorLut = config->getProcessor(lut);
+    OCIO_CHECK_EQUAL(processorLut->getNumTransforms(), 1);
+    OCIO_CHECK_EQUAL(std::string(processorLut->getCacheID()), "2b26d0097cdcf8f141fe3b3d6e21b5ec");
+
+    // Check behaviour of the cacheID
+
+    // Change a value and check that the cacheID changes.
+    lut->setValue(2, 2, 2, 1.f, 3.f, 4.f);
+    processorLut = config->getProcessor(lut);
+    OCIO_CHECK_EQUAL(std::string(processorLut->getCacheID()), "288ec8ea132adaca5b5aed24a296a1a2");
+
+    // Restore the original value, check that the cache ID matches what it used to be.
+    lut->setValue(2, 2, 2, 2.f, 3.f, 4.f);
+    processorLut = config->getProcessor(lut);
+    OCIO_CHECK_EQUAL(std::string(processorLut->getCacheID()), "2b26d0097cdcf8f141fe3b3d6e21b5ec");
+}
+
 OCIO_ADD_TEST(Processor, unique_dynamic_properties)
 {
     OCIO::TransformDirection direction = OCIO::TRANSFORM_DIR_FORWARD;