Merge branch 'main' into python_cibuildwheels

AcademySoftwareFoundation · Sep 30, 2024 · 77fcc6b · 77fcc6b
2 parents bfae087 + 8bfa994
commit 77fcc6b
Show file tree

Hide file tree

Showing 42 changed files with 1,044 additions and 397 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -213,7 +213,7 @@ jobs:
             pybind11_ver: v2.10.0
             skip_tests: 1
             # abi_check: v2.6.2.0
-            abi_check: d950d03f774fc26e588c4591541b4354bc8f0e64
+            abi_check: 14be11a71d7425c1ffeeaed25385fbf41a049d16
             setenvs: export OIIO_CMAKE_FLAGS="-DOIIO_BUILD_TOOLS=0 -DOIIO_BUILD_TESTS=0 -DUSE_PYTHON=0"
                             USE_OPENCV=0 USE_FFMPEG=0 USE_PYTHON=0 USE_FREETYPE=0
                             CMAKE_BUILD_TYPE=RelWithDebInfo

diff --git a/INSTALL.md b/INSTALL.md
@@ -26,7 +26,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
  * **OpenColorIO >= 2.2** (tested through 2.3 and main)
  * libjpeg >= 8 (tested through jpeg9e), or **libjpeg-turbo >= 2.1** (tested
    through 3.0)
- * **[fmtlib](https://github.com/fmtlib/fmt) >= 7.0** (tested through 10.2).
+ * **[fmtlib](https://github.com/fmtlib/fmt) >= 7.0** (tested through 11.0).
    If not found at build time, this will be automatically downloaded unless
    the build sets `-DBUILD_MISSING_FMT=OFF`.
 

diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
@@ -218,7 +218,7 @@ checked_find_package (Robinmap REQUIRED
 option (OIIO_INTERNALIZE_FMT "Copy fmt headers into <install>/include/OpenImageIO/detail/fmt" ON)
 checked_find_package (fmt REQUIRED
                       VERSION_MIN 7.0
-                      VERSION_MAX 10.99
+                      VERSION_MAX 11.99
                       BUILD_LOCAL missing
                      )
 get_target_property(FMT_INCLUDE_DIR fmt::fmt-header-only INTERFACE_INCLUDE_DIRECTORIES)

diff --git a/src/doc/builtinplugins.rst b/src/doc/builtinplugins.rst
@@ -2179,6 +2179,11 @@ options are supported:
        0 - do not use FBDD noise reduction, 1 - light FBDD reduction,
        2 (and more) - full FBDD reduction
        (Default: 0)
+   * - ``raw:max_raw_memory_mb``
+     - int
+     - Maximum memory allocation for processing of raw images. Stop processing if
+       raw buffer size grows larger than that value (in megabytes).
+       (Default: 2048)
 
 
 |