OpenImageIO 3.0.3.1__tar.gz → 3.0.5.0__tar.gz

openimageio-3.0.5.0/.gitattributes

@@ -0,0 +1,11 @@
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: Apache-2.0
+# https://github.com/AcademySoftwareFoundation/OpenImageIO
+
+# Helpful documentation:
+# - https://github.com/github-linguist/linguist/blob/main/docs/overrides.md
+# - https://github.com/github-linguist/linguist/blob/main/docs/troubleshooting.md
+
+
+*.h linguist-language=C++
+src/libOpenImageIO/bluenoise.inc -linguist-detectable

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/.gitignore

@@ -8,6 +8,7 @@ wheelhouse/
 _coverage/
 .python-version
 .idea
+.vs
 .vscode
 .cproject
 .project

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/CHANGES.md

@@ -1,3 +1,43 @@
+Release 3.0.5.0 (Apr 2, 2025) -- compared to 3.0.4.0
+-----------------------------------------------------
+  - *ImageBuf*: `ImageBuf::merge_metadata()` merges one IB's metadata into another's without deleting the metadata already present. It can also filter which metadata are copied using a regex. [#4672](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4672)
+  - *oiiotool*: `--pastemeta` now takes additional modifiers that allows options for merging rather than rewriting, and is able to copy only a subset of the metadata specified by a regex. [#4672](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4672) [#4674](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4674) [#4676](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4676)
+  - *oiiotool*: Fix invalid loop bound when appending mipmap textures using oiiotool [#4671](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4671) (by Basile Fraboni)
+  - *png*: Increase allowed width/height limit [#4655](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4655) (by Jesse Yurkovich)
+  - *psd*: Improved tag recognition in psd files [#4663](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4663) (by Lydia Zheng)
+  - *tiff*: The default value for bitspersample should be 1 [#4670](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4670) (by vernalchen)
+  - *int*: Switch to spans for some exif manipulation, fixing warnings [#4689](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4689)
+  - *span.h*: OIIO::span improvements [#4667](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4667)
+  - *build*: Better disabling of work when USE_PYTHON=0 [#4657](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4657)
+  - *build*: Improve OpenJpeg version detection. [#4665](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4665) (by jreichel-nvidia)
+  - *build*: Bump auto-build libdeflate to 1.23 to avoid AVX512 not available errors [#4679](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4679) (by LI JI)
+  - *build*: Cmake 4.0 compatibility [#4686](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4686) [#4688](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4688)
+  - *ci*: Fix wheel building on Mac [#4668](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4668) [#4675](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4675)
+  - *ci*: Update libPNG address and version for ci & autobuild [#4659](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4659)
+
+
+
+Release 3.0.4.0 (Mar 2, 2025) -- compared to 3.0.3.0
+-----------------------------------------------------
+  - *oiiotool*: Oiiotool new expression eval tokens IS_CONSTANT, IS_BLACK [#4610](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4610) (by Lydia Zheng)
+  - *oiiotool*: Better handling of wildcards that match no files [#4627](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4627)
+  - *ImageBuf*: IB::pixeltype() did not always return the right value [#4614](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4614)
+  - *ImageBuf*: Fix bug in ImageBuf construction from ptr + neg strides [#4630](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4630)
+  - *ICC*: ICC profile recognition and robustness improvements, especially for PSD [#4644](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4644)
+  - *exr*: Fill in OpenEXR lineOrder attribute when reading [#4628](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4628) (by vernalchen)
+  - *ico*: More robust to corrupted ICO files [#4625](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4625)
+  - *rla*: More robust to corrupted RLA files that could overrun buffers [#4624](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4624)
+  - *span.h*: Eliminate needless definitions of `std::size(span)` that were triggering strange behavior on recent MSVS compiler versions. [#4652](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4652)
+  - *build*: Fix recently broken rpath setting [#4618](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4618)
+  - *build/python wheels*: Ensure python-based builds use maj.min.patch SO versioning [#4634](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4634) (by zachlewis)
+  - *build/python wheels*: Fix recently broken rpath to restore python wheel building [#4633](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4633)
+  - *ci*: Run wheel workflow on certain pushes [#4617](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4617)
+  - *docs*: Argparse documentation/comments typos [#4612](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4612)
+  - *admin*: Document Python Wheel completed in roadmap [#4620](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4620) (by Todica Ionut)
+  - *admin*: Add ".vs" to .gitignore [#4645](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4645)
+  - *admin*: Set up .gitattributes file and ensure it properly categorizes certain files for GitHub's language analysis statistics. [#4648](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4648)
+
+
 Release 3.0.3.1 (Feb 1, 2025) -- compared to 3.0.3.1
 -----------------------------------------------------
 The code is identical to v3.0.3.0, but some build issues were fixed to allow

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/CMakeLists.txt

@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 # https://github.com/AcademySoftwareFoundation/OpenImageIO
 
-cmake_minimum_required (VERSION 3.18.2)
+cmake_minimum_required (VERSION 3.18.2...4.0)
 
-set (OpenImageIO_VERSION "3.0.3.1")
+set (OpenImageIO_VERSION "3.0.5.0")
 set (OpenImageIO_VERSION_OVERRIDE "" CACHE STRING
      "Version override (use with caution)!")
 mark_as_advanced (OpenImageIO_VERSION_OVERRIDE)

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/CREDITS.md

@@ -134,6 +134,7 @@ lg@openimageio.org
 * LazyDodo
 * Leonid Onokhov
 * Leszek Godlewski
+* Li Ji
 * Lucas Panian
 * Lucille Caillaud
 * Lukas Schrangl
@@ -222,6 +223,7 @@ lg@openimageio.org
 * Todica Ionut
 * Tom Knowles
 * Troy James Sobotka
+* Vernal Chen
 * Vic P
 * Vinod Khare
 * Vishal Agrawal

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/INSTALL.md

@@ -19,13 +19,13 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
        CMake configuration flag: `-DCMAKE_CXX_STANDARD=20`, etc.
  * Compilers: **gcc 9.3** - 14.2, **clang 5** - 19, MSVS 2017 - 2019 (**v19.14
    and up**), **Intel icc 19+**, Intel OneAPI C++ compiler 2022+.
- * **CMake >= 3.18.2** (tested through 3.31)
+ * **CMake >= 3.18.2** (tested through 4.0)
  * **Imath >= 3.1** (tested through 3.1.x and main)
  * **OpenEXR >= 3.1** (tested through 3.3 and main)
  * **libTIFF >= 4.0** (tested through 4.7)
  * **OpenColorIO >= 2.2** (tested through 2.4 and main)
  * libjpeg >= 8 (tested through jpeg9e), or **libjpeg-turbo >= 2.1** (tested
-   through 3.0)
+   through 3.1)
  * **[fmtlib](https://github.com/fmtlib/fmt) >= 7.0** (tested through 11.1).
    If not found at build time, this will be automatically downloaded unless
    the build sets `-DBUILD_MISSING_FMT=OFF`.
@@ -33,14 +33,14 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
 ### Optional dependencies -- features may be disabled if not found
  * If you are building the `iv` viewer (which will be disabled if any of
    these are not found):
-     * Qt5 >= 5.6 (tested through 5.15) or Qt6 (tested through 6.7)
+     * Qt5 >= 5.6 (tested through 5.15) or Qt6 (tested through 6.8)
      * OpenGL
  * If you are building the Python bindings or running the testsuite:
      * **Python >= 3.7** (tested through 3.13)
-     * **pybind11 >= 2.7** (tested through 2.12)
-     * NumPy
+     * **pybind11 >= 2.7** (tested through 2.13)
+     * NumPy (tested through 2.2.4)
  * If you want support for PNG files:
-     * **libPNG >= 1.6.0** (tested though 1.6.43)
+     * **libPNG >= 1.6.0** (tested though 1.6.47)
  * If you want support for camera "RAW" formats:
      * **LibRaw >= 0.20** (tested though 0.21.3 and master)
  * If you want support for a wide variety of video formats:
@@ -49,25 +49,25 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
      * OpenJpeg >= 2.0 (tested through 2.5; we recommend 2.4 or higher
        for multithreading support)
  * If you want support for OpenVDB files:
-     * OpenVDB >= 9.0 (tested through 11.0). Note that using OpenVDB >= 10.0
+     * OpenVDB >= 9.0 (tested through 12.0). Note that using OpenVDB >= 10.0
        requires that you compile OIIO with C++17 or higher.
  * If you want to use TBB as the thread pool:
      * TBB >= 2018 (tested through 2021 and OneTBB)
  * If you want support for converting to and from OpenCV data structures,
    or for capturing images from a camera:
-     * **OpenCV 4.x** (tested through 4.10)
+     * **OpenCV 4.x** (tested through 4.11)
  * If you want support for GIF images:
-     * **giflib >= 5.0** (tested through 5.2)
+     * **giflib >= 5.0** (tested through 5.2.2)
  * If you want support for HEIF/HEIC or AVIF images:
      * **libheif >= 1.11** (1.16 required for correct orientation support,
-       tested through 1.18.2)
+       tested through 1.19.7)
      * libheif must be built with an AV1 encoder/decoder for AVIF support.
  * If you want support for DICOM medical image files:
      * DCMTK >= 3.6.1 (tested through 3.6.8)
  * If you want support for WebP images:
      * **WebP >= 1.1** (tested through 1.5)
  * If you want support for Ptex:
-     * Ptex >= 2.3.1 (probably works for older; tested through 2.4.2)
+     * Ptex >= 2.3.1 (probably works for older; tested through 2.4.3)
  * If you want to be able to do font rendering into images:
      * **Freetype >= 2.10.0** (tested through 2.13)
  * We use PugiXML for XML parsing. There is a version embedded in the OIIO

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OpenImageIO
-Version: 3.0.3.1
+Version: 3.0.5.0
 Summary: Reading, writing, and processing images in a wide variety of file formats, using a format-agnostic API, aimed at VFX applications.
 Author-Email: Larry Gritz <lg@larrygritz.com>, OpenImageIO Contributors <oiio-dev@lists.aswf.io>
 Maintainer-Email: OpenImageIO Contributors <oiio-dev@lists.aswf.io>

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/build-scripts/build_Freetype.bash

@@ -20,6 +20,10 @@ FREETYPE_BUILD_DIR=${FREETYPE_BUILD_DIR:=${FREETYPE_SRC_DIR}/build}
 FREETYPE_INSTALL_DIR=${FREETYPE_INSTALL_DIR:=${LOCAL_DEPS_DIR}/dist}
 FREETYPE_BUILD_TYPE=${FREETYPE_BUILD_TYPE:=Release}
 
+# Fix for freetype breaking against cmake 4.0 because of too-old cmake min.
+# Remove when freetype is fixed to declare its own minimum high enough.
+export CMAKE_POLICY_VERSION_MINIMUM=3.5
+
 pwd
 echo "Freetype install dir will be: ${FREETYPE_INSTALL_DIR}"
 

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/build-scripts/build_OpenJPEG.bash

@@ -20,6 +20,10 @@ OPENJPEG_BUILD_DIR=${OPENJPEG_BUILD_DIR:=${OPENJPEG_SRC_DIR}/build}
 OPENJPEG_INSTALL_DIR=${OPENJPEG_INSTALL_DIR:=${LOCAL_DEPS_DIR}/dist}
 #OPENJPEG_CONFIG_OPTS=${OPENJPEG_CONFIG_OPTS:=}
 
+# Fix for openjpeg breaking against cmake 4.0 because of too-old cmake min.
+# Remove when openjpeg is fixed to declare its own minimum high enough.
+export CMAKE_POLICY_VERSION_MINIMUM=3.5
+
 pwd
 echo "OpenJPEG install dir will be: ${OPENJPEG_INSTALL_DIR}"
 

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/build-scripts/build_libpng.bash

@@ -10,8 +10,8 @@
 set -ex
 
 # Repo and branch/tag/commit of libpng to download if we don't have it yet
-LIBPNG_REPO=${LIBPNG_REPO:=https://github.com/glennrp/libpng.git}
-LIBPNG_VERSION=${LIBPNG_VERSION:=v1.6.35}
+LIBPNG_REPO=${LIBPNG_REPO:=https://github.com/pnggroup/libpng.git}
+LIBPNG_VERSION=${LIBPNG_VERSION:=v1.6.47}
 
 # Where to put libpng repo source (default to the ext area)
 LIBPNG_SRC_DIR=${LIBPNG_SRC_DIR:=${PWD}/ext/libpng}

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/build-scripts/build_opencolorio.bash

@@ -28,6 +28,11 @@ OPENCOLORIO_BUILDOPTS="-DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_NUKE=OFF \
                        -DOCIO_BUILD_PYTHON=OFF -DOCIO_BUILD_PYGLUE=OFF \
                        -DOCIO_BUILD_JAVA=OFF \
                        -DBUILD_SHARED_LIBS=${OPENCOLORIO_BUILD_SHARED_LIBS:=ON}"
+
+# Fix yaml-cpp which breaks against cmake 4.0 because of too-old cmake min.
+# Remove when yaml-cpp is fixed to declare its own minimum high enough.
+export CMAKE_POLICY_VERSION_MINIMUM=3.5
+
 BASEDIR=`pwd`
 pwd
 echo "OpenColorIO install dir will be: ${OPENCOLORIO_INSTALL_DIR}"

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/build-scripts/build_pybind11.bash

@@ -22,6 +22,10 @@ LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
 PYBIND11_INSTALL_DIR=${PYBIND11_INSTALL_DIR:=${LOCAL_DEPS_DIR}/dist}
 #PYBIND11_BUILD_OPTS=${PYBIND11_BUILD_OPTS:=}
 
+# Fix for pybind11 breaking against cmake 4.0 because of too-old cmake min.
+# Remove when pybind11 is fixed to declare its own minimum high enough.
+export CMAKE_POLICY_VERSION_MINIMUM=3.5
+
 if [[ "${PYTHON_VERSION}" != "" ]] ; then
     PYBIND11_BUILD_OPTS+=" -DPYBIND11_PYTHON_VERSION=${PYTHON_VERSION}"
 fi

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/build-scripts/build_zlib.bash

@@ -21,6 +21,10 @@ ZLIB_BUILD_DIR=${ZLIB_BUILD_DIR:=${ZLIB_SRC_DIR}/build}
 ZLIB_INSTALL_DIR=${ZLIB_INSTALL_DIR:=${PWD}/ext/dist}
 #ZLIB_CONFIG_OPTS=${ZLIB_CONFIG_OPTS:=}
 
+# Fix zlib which breaks against cmake 4.0 because of too-old cmake min.
+# Remove when zlib is fixed to declare its own minimum high enough.
+export CMAKE_POLICY_VERSION_MINIMUM=3.5
+
 pwd
 echo "zlib install dir will be: ${ZLIB_INSTALL_DIR}"
 

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/cmake/build_Freetype.cmake

@@ -32,6 +32,9 @@ build_dependency_with_cmake(Freetype
         -D CMAKE_POSITION_INDEPENDENT_CODE=ON
         -D CMAKE_INSTALL_LIBDIR=lib
         ${_freetype_EXTRA_CMAKE_ARGS}
+        # Fix for freetype breaking against cmake 4.0.
+        # Remove when freetype is fixed to declare its own minimum high enough.
+        -D CMAKE_POLICY_VERSION_MINIMUM=3.5
 )
 
 # Set some things up that we'll need for a subsequent find_package to work

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/cmake/build_OpenColorIO.cmake

@@ -51,6 +51,9 @@ build_dependency_with_cmake(OpenColorIO
         # conflict with any others in the system or linked into the same app.
         # -D OCIO_NAMESPACE=${OpenColorIO_VERSION_IDENT}_${PROJ_NAME}
         -D OCIO_LIBNAME_SUFFIX=_v${OpenColorIO_VERSION_IDENT}_${PROJ_NAME}
+        # Fix for yaml-cpp breaking against cmake 4.0.
+        # Remove when yaml-cpp is fixed to declare its own minimum high enough.
+        -D CMAKE_POLICY_VERSION_MINIMUM=3.5
     )
 
 # Set some things up that we'll need for a subsequent find_package to work

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/cmake/build_PNG.cmake

@@ -6,8 +6,8 @@
 # PNG by hand!
 ######################################################################
 
-set_cache (PNG_BUILD_VERSION 1.6.44 "PNG version for local builds")
-set (PNG_GIT_REPOSITORY "https://github.com/glennrp/libpng")
+set_cache (PNG_BUILD_VERSION 1.6.47 "PNG version for local builds")
+set (PNG_GIT_REPOSITORY "https://github.com/pnggroup/libpng")
 set (PNG_GIT_TAG "v${PNG_BUILD_VERSION}")
 
 set_cache (PNG_BUILD_SHARED_LIBS OFF

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/cmake/build_ZLIB.cmake

@@ -23,6 +23,9 @@ build_dependency_with_cmake(ZLIB
         -D BUILD_SHARED_LIBS=${ZLIB_BUILD_SHARED_LIBS}
         -D CMAKE_POSITION_INDEPENDENT_CODE=ON
         -D CMAKE_INSTALL_LIBDIR=lib
+        # Fix for zlib breaking against cmake 4.0.
+        # Remove when zlib is fixed to declare its own minimum high enough.
+        -D CMAKE_POLICY_VERSION_MINIMUM=3.5
     )
 
 # Set some things up that we'll need for a subsequent find_package to work

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/cmake/build_libdeflate.cmake

@@ -6,7 +6,7 @@
 # libdeflate by hand!
 ######################################################################
 
-set_cache (libdeflate_BUILD_VERSION 1.20 "libdeflate version for local builds")
+set_cache (libdeflate_BUILD_VERSION 1.23 "libdeflate version for local builds")
 set (libdeflate_GIT_REPOSITORY "https://github.com/ebiggers/libdeflate")
 set (libdeflate_GIT_TAG "v${libdeflate_BUILD_VERSION}")
 set_cache (libdeflate_BUILD_SHARED_LIBS OFF # ${LOCAL_BUILD_SHARED_LIBS_DEFAULT}

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/cmake/build_pybind11.cmake

@@ -23,6 +23,9 @@ build_dependency_with_cmake(pybind11
         # Don't built unnecessary parts of Pybind11
         -D BUILD_TESTING=OFF
         -D PYBIND11_TEST=OFF
+        # Fix for pybind11 breaking against cmake 4.0.
+        # Remove when pybind11 is fixed to declare its own minimum high enough.
+        -D CMAKE_POLICY_VERSION_MINIMUM=3.5
     )
 
 

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/cmake/compiler.cmake

@@ -625,7 +625,7 @@ set (EXTRA_DSO_LINK_ARGS "" CACHE STRING "Extra command line definitions when bu
 ###########################################################################
 # Set the versioning for shared libraries.
 #
-if (${PROJECT_NAME}_SUPPORTED_RELEASE)
+if (${PROJECT_NAME}_SUPPORTED_RELEASE AND NOT SKBUILD)
     # Supported releases guarantee ABI back-compatibility within the release
     # family, so SO versioning is major.minor.
     set (SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
@@ -698,7 +698,9 @@ else ()
         else()
             set(BASEPOINT $ORIGIN)
         endif()
-        set (CMAKE_INSTALL_RPATH ${BASEPOINT} ${BASEPOINT}/${CMAKE_INSTALL_LIBDIR})
+        set (CMAKE_INSTALL_RPATH ${BASEPOINT}
+                                 ${BASEPOINT}/${CMAKE_INSTALL_LIBDIR}
+                                 ${BASEPOINT}/../${CMAKE_INSTALL_LIBDIR})
     endif ()
     # add the automatically determined parts of the RPATH that
     # point to directories outside the build tree to the install RPATH

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/cmake/externalpackages.cmake

@@ -113,7 +113,9 @@ else ()
 endif()
 
 # From pythonutils.cmake
-find_python()
+if (USE_PYTHON)
+    find_python()
+endif ()
 if (USE_PYTHON)
     checked_find_package (pybind11 REQUIRED VERSION_MIN 2.7)
 endif ()

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/cmake/fancy_add_executable.cmake

@@ -53,12 +53,6 @@ macro (fancy_add_executable)
         target_link_libraries (${_target_NAME} PRIVATE ${_target_LINK_LIBRARIES})
         target_link_libraries (${_target_NAME} PRIVATE ${PROFILER_LIBRARIES})
         set_target_properties (${_target_NAME} PROPERTIES FOLDER ${_target_FOLDER})
-        if (SKBUILD) 
-            # The installed bin and lib directories are at the same level, so we
-            # need to set the rpath to look for the libraries in ../lib
-            set_target_properties (${_target_NAME} PROPERTIES
-                INSTALL_RPATH "$<IF:$<BOOL:${APPLE}>,@loader_path,$ORIGIN>/../${CMAKE_INSTALL_LIBDIR}")
-        endif ()
         check_is_enabled (INSTALL_${_target_NAME} _target_NAME_INSTALL_enabled)
         if (CMAKE_UNITY_BUILD AND UNITY_BUILD_MODE STREQUAL GROUP)
             set_source_files_properties(${_target_SRC} PROPERTIES

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/cmake/modules/FindOpenJPEG.cmake

@@ -83,10 +83,8 @@ if (OPENJPEG_INCLUDE_DIR)
 endif ()
 
 # Search for opj_config.h -- it is only part of OpenJpeg >= 2.0, and will
-# contain symbols OPJ_VERSION_MAJOR and OPJ_VERSION_MINOR. If the file
-# doesn't exist, we're dealing with OpenJPEG 1.x.
-# Note that for OpenJPEG 2.x, the library is named libopenjp2, not
-# libopenjpeg (which is for 1.x)
+# contain symbols OPJ_VERSION_MAJOR, OPJ_VERSION_MINOR, and OBJ_VERSION_BUILD
+# since OpenJpeg >= 2.1.
 set (OPENJPEG_CONFIG_FILE "${OPENJPEG_INCLUDE_DIR}/opj_config.h")
 if (EXISTS "${OPENJPEG_CONFIG_FILE}")
     file(STRINGS "${OPENJPEG_CONFIG_FILE}" TMP REGEX "^#define OPJ_PACKAGE_VERSION .*$")
@@ -94,20 +92,24 @@ if (EXISTS "${OPENJPEG_CONFIG_FILE}")
         # 2.0 is the only one with this construct
         set (OPJ_VERSION_MAJOR 2)
         set (OPJ_VERSION_MINOR 0)
+        set (OPJ_VERSION_BUILD 0)
     else ()
         # 2.1 and beyond
         file(STRINGS "${OPENJPEG_CONFIG_FILE}" TMP REGEX "^#define OPJ_VERSION_MAJOR .*$")
         string (REGEX MATCHALL "[0-9]+" OPJ_VERSION_MAJOR ${TMP})
         file(STRINGS "${OPENJPEG_CONFIG_FILE}" TMP REGEX "^#define OPJ_VERSION_MINOR .*$")
         string (REGEX MATCHALL "[0-9]+" OPJ_VERSION_MINOR ${TMP})
+        file(STRINGS "${OPENJPEG_CONFIG_FILE}" TMP REGEX "^#define OPJ_VERSION_BUILD .*$")
+        string (REGEX MATCHALL "[0-9]+" OPJ_VERSION_BUILD ${TMP})
     endif ()
 else ()
     # Guess OpenJPEG 1.5 -- older versions didn't have the version readily
     # apparent in the headers.
     set (OPJ_VERSION_MAJOR 1)
     set (OPJ_VERSION_MINOR 5)
+    set (OPJ_VERSION_BUILD 0)
 endif ()
-set (OPENJPEG_VERSION "${OPJ_VERSION_MAJOR}.${OPJ_VERSION_MINOR}")
+set (OPENJPEG_VERSION "${OPJ_VERSION_MAJOR}.${OPJ_VERSION_MINOR}.${OPJ_VERSION_BUILD}")
 
 
 # Locate the OpenJpeg library

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/doc/imagebuf.rst

@@ -149,8 +149,9 @@ Copying ImageBuf's and blocks of pixels
 .. doxygenfunction:: OIIO::ImageBuf::operator=(ImageBuf &&src)
 .. doxygenfunction:: OIIO::ImageBuf::copy(const ImageBuf &src, TypeDesc format = TypeUnknown)
 .. doxygenfunction:: OIIO::ImageBuf::copy(TypeDesc format) const
-.. doxygenfunction:: OIIO::ImageBuf::copy_metadata
 .. doxygenfunction:: OIIO::ImageBuf::copy_pixels
+.. doxygenfunction:: OIIO::ImageBuf::copy_metadata
+.. doxygenfunction:: OIIO::ImageBuf::merge_metadata
 .. doxygenfunction:: OIIO::ImageBuf::swap
 
 

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/doc/oiiotool.rst

@@ -163,7 +163,9 @@ contents of an expression may be any of:
     information from when the file was read from disk.
   * `STATS` : a multi-line string containing the image statistics that would
     be printed with `oiiotool -stats`.
-
+  * `IS_CONSTANT`: metadata to check if the image pixels are of constant color, returns 1 if true, and 0 if false.
+  * `IS_BLACK`: metadata to check if the image pixels are all black, a subset of IS_CONSTANT. Also returns 1 if true, and 0 if false.
+  
 * *imagename.'metadata'*
 
   If the metadata name is not a "C identifier" (initial letter followed by
@@ -2994,20 +2996,40 @@ current top image.
 
 .. option:: --pastemeta <location>
 
-    Takes two images -- the first will be a source of metadata only, and the
-    second the source of pixels -- and produces a new copy of the second
-    image with the metadata from the first image added.
+    Takes two images -- the first image will be a source of metadata only, and the
+    second "destination" image will supply the pixels -- and produces a combined
+    image.
 
-    The output image's pixels will come only from the second input. Metadata
-    from the second input will be preserved if no identically-named metadata
-    was present in the first input image.
+    Optional appended modifiers include:
+
+    - `merge=` *int* : Determines the metadata merging strategy. If `0` (the
+      default), performs a full replacement -- the metadata from the
+      destination (second) image will be discarded entirely and re-populated
+      with the metadata from the metadata source (first) image. If `1`,
+      metadata from the source image will be non-destructively added to that
+      of the existing metadata of the destination image, item by item, if it
+      doesn't already contain metadata with the same name. If `2`, metadata
+      from the source image will be destructively added to that of the
+      existing metadata of the destination image, item by item, and will
+      replace any metadata already present having the same name. (This
+      modifier was added in OIIO 3.0.4.)
+
+    - `pattern=` *regex* : If supplied, only copies metadata whose name
+      matches has a substring matching the regular expression. The special
+      character `^` indicates the beginning of the string and `$` indicates
+      the end of the string. (This modifier was added in OIIO 3.0.4.)
 
     Examples::
 
-        # Add all the metadata from meta.exr to pixels.exr and write the
-        # combined image to out.exr.
+        # Add all the metadata from meta.exr to pixels.exr, discarding any
+        # metadata it previously had, and write the combined image to out.exr.
         oiiotool meta.exr pixels.exr --pastemeta -o out.exr
 
+        # Add all of meta.exr's metadata whose name begins with "camera:"
+        # to pixels.exr, replacing any identically named items but leaving
+        # others as they were, and write the combined image to out.exr.
+        oiiotool meta.exr pixels.exr --pastemeta:merge=2:pattern="^camera:override=1" -o out.exr
+
 
 .. option:: --mosaic <size>
 

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/doc/pythonbindings.rst

@@ -1966,19 +1966,6 @@ awaiting a call to `reset()` or `copy()` before it is useful.
     the ImageBuf.
 
 
-.. py:method:: ImageBuf.copy_metadata (other_imagebuf)
-
-    Replaces the metadata (all ImageSpec items, except for the data format
-    and pixel data window size) with the corresponding metadata from the
-    other ImageBuf.
-
-
-.. py:method:: ImageBuf.copy_pixels (other_imagebuf)
-
-    Replace the pixels in this ImageBuf with the values from the other
-    ImageBuf.
-
-
 .. py:method:: ImageBuf ImageBuf.copy (format=TypeUnknown)
 
     Return a full copy of this ImageBuf (with optional data format
@@ -2020,6 +2007,40 @@ awaiting a call to `reset()` or `copy()` before it is useful.
 
 
 
+.. py:method:: ImageBuf.copy_pixels (other_imagebuf)
+
+    Replace the pixels in this ImageBuf with the values from the other
+    ImageBuf.
+
+
+.. py:method:: ImageBuf.copy_metadata (other_imagebuf)
+
+    Replace the metadata of `Self` (all ImageSpec items, except for the data
+    format and pixel data window size) with the metadata from the other
+    ImageBuf.
+
+
+.. py:method:: ImageBuf.merge_metadata (src, override : bool = False, pattern : str = "")
+
+    Merge metadata from `src` into the metadata of `Self` (except for the data
+    format and pixel data window size). Metadata in `Self` that is not in
+    `src` will not be altered. Metadata in `Self` that also is in `src` will
+    be replaced only if `override` is True. If `pattern` is not empty, only
+    metadata having a substring that matches the regex pattern will be merged.
+
+    @version 3.0.5+
+
+    Example:
+
+    .. code-block:: python
+
+        A = ImageBuf("A.exr")
+        B = ImageBuf("B.exr")
+        A.merge_metadata(B, True, "^camera:")
+        # Now A contains all of B's metadata whose name starts with the
+        # substring "camera:"
+
+
 .. py:method:: ImageBuf.swap (other_imagebuf)
 
     Swaps the content of this ImageBuf and the other ImageBuf.

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/ico.imageio/icoinput.cpp

@@ -190,6 +190,19 @@ ICOInput::seek_subimage(int subimage, int miplevel)
         swap_endian(&subimg.numColours);
     }
 
+    // some sanity checking
+    if (subimg.bpp != 1 && subimg.bpp != 4 && subimg.bpp != 8
+        && subimg.bpp != 16 && subimg.bpp != 24 && subimg.bpp != 32) {
+        errorfmt("Unsupported image color depth, probably corrupt file");
+        return false;
+    }
+    if (subimg.reserved != 0) {
+        errorfmt(
+            "Probably corrupt file (clue: header 'reserved' value should always be 0)",
+            subimg.reserved);
+        return false;
+    }
+
     ioseek(subimg.ofs, SEEK_SET);
 
     // test for a PNG icon

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/include/OpenImageIO/argparse.h

@@ -65,7 +65,7 @@ OIIO_NAMESPACE_BEGIN
 ///
 /// Parse the command line:
 ///
-///     ap.parse (argc, argv);
+///     ap.parse_args(argc, argv);
 ///
 /// Extract the values like they are attributes in a ParamValueList:
 ///
@@ -79,7 +79,7 @@ OIIO_NAMESPACE_BEGIN
 // Old syntax
 // ----------
 //
-// We still support this old syntax as well:
+// We still support this old syntax as well, but only internally:
 //
 // The parse function takes a list of options and variables or functions
 // for storing option values and return <0 on failure:
@@ -107,7 +107,7 @@ OIIO_NAMESPACE_BEGIN
 //                   "set the camera position",
 //             "-lookat %f %f %f", &lx, &ly, &lz,
 //                   "set the position of interest",
-//             "-oversampling %d", &oversampling,  "oversamping rate",
+//             "-oversampling %d", &oversampling,  "oversampling rate",
 //             "-passes %d", &passes, "number of passes",
 //             "-lens %f %f %f", &aperture, &focalDistance, &focalLength,
 //                    "set aperture, focal distance, focal length",

{openimageio-3.0.3.1 → openimageio-3.0.5.0}/src/include/OpenImageIO/imagebuf.h

@@ -669,10 +669,36 @@ public:
     /// Move assignment.
     const ImageBuf& operator=(ImageBuf&& src);
 
-    /// Copy all the metadata from `src` to `*this` (except for pixel data
-    /// resolution, channel types and names, and data format).
+    /// Copy all the metadata from `src` to `*this`, replacing all named
+    /// metadata that was previously in `*this`. The "full" size and desired
+    /// tile size will also be replaced by the corresponding values from
+    /// `src`, but the pixel data resolution, channel types and names, and
+    /// data format of `*this` will not be altered.
     void copy_metadata(const ImageBuf& src);
 
+    /// Merge metadata from `src` into the metadata of `*this` (except for the
+    /// data format and pixel data window size). Metadata in `*this` that is
+    /// not in `src` will not be altered. Metadata in `*this` that also is in
+    /// `src` will be replaced only if `override` is True. If `pattern` is not
+    /// empty, only metadata having a substring that matches the regex pattern
+    /// will be merged.
+    ///
+    /// @param src
+    ///     The source ImageBuf supplying the metadata (but not pixel
+    ///     values).
+    /// @param override
+    ///     If true, `src` attributes will replace any identically-named
+    ///     attributes already in `*this`. If false (the default), only
+    ///     attributes whose names are not already in this list will be
+    ///     appended.
+    /// @param pattern
+    ///     If not empty, only copy metadata from `src` whose name contains
+    ///     a substring matching the regex `pattern`.
+    ///
+    /// @version 3.0.5+
+    void merge_metadata(const ImageBuf& src, bool override = false,
+                        string_view pattern = {});
+
     /// Copy the pixel data from `src` to `*this`, automatically converting
     /// to the existing data format of `*this`.  It only copies pixels in
     /// the overlap regions (and channels) of the two images; pixel data in