Skip to content

Commit 8879c19

Browse files
committed
deps: Support for OpenColorIO 2.5 (#4916)
A test needed updating because the set of color spaces in the built-in config are different than for 2.4. Fixes #4915 Signed-off-by: Larry Gritz <[email protected]>
1 parent b82d91c commit 8879c19

File tree

4 files changed

+34
-3
lines changed

4 files changed

+34
-3
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ jobs:
422422
cxx_compiler: g++-13
423423
cxx_std: 20
424424
fmt_ver: 11.2.0
425-
opencolorio_ver: v2.4.2
425+
opencolorio_ver: v2.5.0
426426
openexr_ver: v3.4.0
427427
pybind11_ver: v3.0.0
428428
python_ver: "3.12"
@@ -521,7 +521,7 @@ jobs:
521521
cxx_compiler: g++-14
522522
cxx_std: 20
523523
fmt_ver: 11.2.0
524-
opencolorio_ver: v2.4.2
524+
opencolorio_ver: v2.5.0
525525
openexr_ver: v3.4.0
526526
pybind11_ver: v3.0.0
527527
python_ver: "3.12"

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Release 3.0.11.0 (Oct 1, 2025) -- compared to 3.0.10.1
55
- *gif*: GIF output didn't handle FramesPerSecond attribute correctly [#4890](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4890)
66
- *deps*: Test freetype 2.14 and document that it works [#4876](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4876)
77
- *deps*: Look for boost headers for OpenVDBs older than 12 [#4873](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4873) (by Alex Fuller)
8+
- *deps*: Support for OpenColorIO 2.5 [#4916](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4916)
89

910

1011
Release 3.0.10.1 (Sep 16, 2025) -- compared to 3.0.10.0

INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
2323
* **Imath >= 3.1** (tested through 3.2 and main)
2424
* **OpenEXR >= 3.1** (tested through 3.4 and main)
2525
* **libTIFF >= 4.0** (tested through 4.7)
26-
* **OpenColorIO >= 2.2** (tested through 2.4 and main)
26+
* **OpenColorIO >= 2.2** (tested through 2.5 and main)
2727
* libjpeg >= 8 (tested through jpeg9e), or **libjpeg-turbo >= 2.1** (tested
2828
through 3.1)
2929
* zlib >= 1.2.7 (tested through 1.3.1)
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
getNumColorSpaces = 25
2+
getColorSpaceNames = ['sRGB - Display', 'Gamma 2.2 Rec.709 - Display', 'Display P3 - Display', 'Display P3 HDR - Display', 'P3-D65 - Display', 'Rec.1886 Rec.709 - Display', 'Rec.2100-PQ - Display', 'ST2084-P3-D65 - Display', 'ACES2065-1', 'ACEScc', 'ACEScct', 'ACEScg', 'sRGB Encoded Rec.709 (sRGB)', 'Gamma 1.8 Encoded Rec.709', 'Gamma 2.2 Encoded Rec.709', 'Gamma 2.4 Encoded Rec.709', 'sRGB Encoded P3-D65', 'Gamma 2.2 Encoded AdobeRGB', 'sRGB Encoded AP1', 'Gamma 2.2 Encoded AP1', 'Linear AdobeRGB', 'Linear P3-D65', 'Linear Rec.2020', 'Linear Rec.709 (sRGB)', 'Raw']
3+
Index of 'lin_srgb' = 23
4+
Index of 'unknown' = -1
5+
Name of color space 2 = Display P3 - Display
6+
getNumLooks = 1
7+
getLookNames = ['ACES 1.3 Reference Gamut Compression']
8+
getNumDisplays = 8
9+
getDisplayNames = ['sRGB - Display', 'Display P3 - Display', 'Display P3 HDR - Display', 'Gamma 2.2 Rec.709 - Display', 'P3-D65 - Display', 'Rec.1886 Rec.709 - Display', 'Rec.2100-PQ - Display', 'ST2084-P3-D65 - Display']
10+
getDefaultDisplayName = sRGB - Display
11+
getNumViews = 4
12+
getViewNames = ['ACES 2.0 - SDR 100 nits (Rec.709)', 'Un-tone-mapped', 'Video (colorimetric)', 'Raw']
13+
getDefaultViewName = ACES 2.0 - SDR 100 nits (Rec.709)
14+
getNumRoles = 9
15+
getRoles = ['aces_interchange', 'cie_xyz_d65_interchange', 'color_picking', 'color_timing', 'compositing_log', 'data', 'matte_paint', 'scene_linear', 'texture_paint']
16+
aliases of 'scene_linear' are ['ACES - ACEScg', 'lin_ap1', 'lin_ap1_scene']
17+
resolve('foo'): foo
18+
resolve('linear'): Linear Rec.709 (sRGB)
19+
resolve('scene_linear'): ACEScg
20+
resolve('lin_srgb'): Linear Rec.709 (sRGB)
21+
resolve('srgb'): sRGB Encoded Rec.709 (sRGB)
22+
resolve('ACEScg'): ACEScg
23+
equivalent('lin_srgb', 'srgb'): False
24+
equivalent('scene_linear', 'srgb'): False
25+
equivalent('linear', 'lin_srgb'): False
26+
equivalent('scene_linear', 'lin_srgb'): False
27+
equivalent('ACEScg', 'scene_linear'): True
28+
equivalent('lnf', 'scene_linear'): False
29+
30+
Done.

0 commit comments

Comments
 (0)