diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f6b47668f..6b9f83a5c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -249,20 +249,20 @@ jobs: fail-fast: false matrix: include: - - desc: latest releases gcc11 C++17 avx2 exr3.1 ocio2.2 + - desc: latest releases gcc11 C++17 avx2 exr3.2 ocio2.3 nametag: linux-latest-releases os: ubuntu-22.04 cc_compiler: gcc-11 cxx_compiler: g++-11 cxx_std: 17 fmt_ver: 9.1.0 - openexr_ver: v3.1.11 + openexr_ver: v3.2.0 pybind11_ver: v2.11.1 python_ver: "3.10" simd: avx2,f16c setenvs: export LIBRAW_VERSION=0.20.2 LIBTIFF_VERSION=v4.5.0 - OPENCOLORIO_VERSION=v2.2.0 + OPENCOLORIO_VERSION=v2.3.0 OPENJPEG_VERSION=v2.4.0 PTEX_VERSION=v2.4.0 PUGIXML_VERSION=v1.13 diff --git a/INSTALL.md b/INSTALL.md index 416ca1c1b1..2ef6882c8b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -68,7 +68,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**. * If you want support for WebP images: * WebP >= 0.6.1 (tested through 1.3.1) * If you want support for OpenColorIO color transformations: - * OpenColorIO >= 1.1 (tested through 2.2; 2.0+ is recommended) + * OpenColorIO >= 1.1 (tested through 2.3; 2.0+ is recommended) * If you want support for Ptex: * Ptex >= 2.3.1 (probably works for older; tested through 2.4.2) * If you want to be able to do font rendering into images: diff --git a/testsuite/python-colorconfig/ref/out-ocio23.txt b/testsuite/python-colorconfig/ref/out-ocio23.txt new file mode 100644 index 0000000000..ce01af5931 --- /dev/null +++ b/testsuite/python-colorconfig/ref/out-ocio23.txt @@ -0,0 +1,30 @@ +getNumColorSpaces = 15 +getColorSpaceNames = ['ACES2065-1', 'ACEScc', 'ACEScct', 'ACEScg', 'Linear P3-D65', 'Linear Rec.2020', 'Linear Rec.709 (sRGB)', 'Gamma 1.8 Rec.709 - Texture', 'Gamma 2.2 AP1 - Texture', 'Gamma 2.2 Rec.709 - Texture', 'Gamma 2.4 Rec.709 - Texture', 'sRGB Encoded AP1 - Texture', 'sRGB Encoded P3-D65 - Texture', 'sRGB - Texture', 'Raw'] +Index of 'lin_srgb' = 6 +Index of 'unknown' = -1 +Name of color space 2 = ACEScct +getNumLooks = 1 +getLookNames = ['ACES 1.3 Reference Gamut Compression'] +getNumDisplays = 6 +getDisplayNames = ['sRGB - Display', 'Display P3 - Display', 'Rec.1886 Rec.709 - Display', 'Rec.2100-PQ - Display', 'ST2084-P3-D65 - Display', 'P3-D65 - Display'] +getDefaultDisplayName = sRGB - Display +getNumViews = 3 +getViewNames = ['ACES 1.0 - SDR Video', 'Un-tone-mapped', 'Raw'] +getDefaultViewName = ACES 1.0 - SDR Video +getNumRoles = 9 +getRoles = ['aces_interchange', 'cie_xyz_d65_interchange', 'color_picking', 'color_timing', 'compositing_log', 'data', 'matte_paint', 'scene_linear', 'texture_paint'] +aliases of 'scene_linear' are ['ACES - ACEScg', 'lin_ap1'] +resolve('foo'): foo +resolve('linear'): ACEScg +resolve('scene_linear'): ACEScg +resolve('lin_srgb'): Linear Rec.709 (sRGB) +resolve('srgb'): sRGB - Texture +resolve('ACEScg'): ACEScg +equivalent('lin_srgb', 'srgb'): False +equivalent('scene_linear', 'srgb'): False +equivalent('linear', 'lin_srgb'): False +equivalent('scene_linear', 'lin_srgb'): False +equivalent('ACEScg', 'scene_linear'): True +equivalent('lnf', 'scene_linear'): False + +Done.