OpenImageIO 3.0.3.1__tar.gz → 3.0.4.0__tar.gz

openimageio-3.0.4.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.4.0}/.gitignore

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

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

@@ -1,3 +1,24 @@
+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.4.0}/CMakeLists.txt

@@ -4,7 +4,7 @@
 
 cmake_minimum_required (VERSION 3.18.2)
 
-set (OpenImageIO_VERSION "3.0.3.1")
+set (OpenImageIO_VERSION "3.0.4.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.4.0}/CREDITS.md

@@ -222,6 +222,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.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OpenImageIO
-Version: 3.0.3.1
+Version: 3.0.4.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.4.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.4.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.4.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

{openimageio-3.0.3.1 → openimageio-3.0.4.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.4.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.4.0}/src/include/OpenImageIO/span.h

@@ -630,21 +630,6 @@ OIIO_NAMESPACE_END
 // Declare std::size and std::ssize for our span.
 namespace std {
 
-template<class T, OIIO::span_size_t E = OIIO::dynamic_extent>
-constexpr size_t
-size(const OIIO::span<T, E>& c)
-{
-    return static_cast<size_t>(c.size());
-}
-
-template<class T, OIIO::span_size_t E = OIIO::dynamic_extent>
-constexpr size_t
-size(const OIIO::span_strided<T, E>& c)
-{
-    return static_cast<size_t>(c.size());
-}
-
-
 #if OIIO_CPLUSPLUS_VERSION < 20
 // C++20 and beyond already have these declared.
 template<class T, OIIO::span_size_t E = OIIO::dynamic_extent>

{openimageio-3.0.3.1 → openimageio-3.0.4.0}/src/include/OpenImageIO/string_view.h

@@ -532,13 +532,6 @@ FMT_END_NAMESPACE
 // Declare std::size and std::ssize for our string_view.
 namespace std {
 
-#if OIIO_CPLUSPLUS_VERSION < 17
-template<class CharT, class Traits = std::char_traits<CharT>>
-constexpr size_t size(const OIIO::basic_string_view<CharT, Traits>& c) {
-    return c.size();
-}
-#endif
-
 #if OIIO_CPLUSPLUS_VERSION < 20
 template<class CharT, class Traits = std::char_traits<CharT>>
 constexpr ptrdiff_t ssize(const OIIO::basic_string_view<CharT, Traits>& c) {

{openimageio-3.0.3.1 → openimageio-3.0.4.0}/src/jpeg.imageio/jpeginput.cpp

@@ -427,8 +427,13 @@ JpgInput::read_icc_profile(j_decompress_ptr cinfo, ImageSpec& spec)
         if (m->marker == (JPEG_APP0 + 2)
             && !strcmp((const char*)m->data, "ICC_PROFILE")) {
             int seq_no = GETJOCTET(m->data[12]);
-            memcpy(icc_buf.data() + data_offset[seq_no],
-                   m->data + ICC_HEADER_SIZE, data_length[seq_no]);
+            if (data_offset[seq_no] + data_length[seq_no] > icc_buf.size()) {
+                errorfmt("Possible corrupt file, invalid ICC profile\n");
+                return false;
+            }
+            spancpy(make_span(icc_buf), data_offset[seq_no],
+                    make_cspan(m->data + ICC_HEADER_SIZE, data_length[seq_no]),
+                    0, data_length[seq_no]);
         }
     }
     spec.attribute("ICCProfile", TypeDesc(TypeDesc::UINT8, total_length),
@@ -436,7 +441,7 @@ JpgInput::read_icc_profile(j_decompress_ptr cinfo, ImageSpec& spec)
 
     std::string errormsg;
     bool ok = decode_icc_profile(icc_buf, spec, errormsg);
-    if (!ok) {
+    if (!ok && OIIO::get_int_attribute("imageinput:strict")) {
         errorfmt("Possible corrupt file, could not decode ICC profile: {}\n",
                  errormsg);
         return false;

{openimageio-3.0.3.1 → openimageio-3.0.4.0}/src/jpeg2000.imageio/jpeg2000input.cpp

@@ -355,10 +355,10 @@ Jpeg2000Input::open(const std::string& name, ImageSpec& p_spec)
             cspan<uint8_t>((const uint8_t*)m_image->icc_profile_buf,
                            m_image->icc_profile_len),
             m_spec, errormsg);
-        if (!ok) {
-            // errorfmt("Could not decode ICC profile: {}\n", errormsg);
-            // return false;
-            // Nah, just skip an ICC specific error?
+        if (!ok && OIIO::get_int_attribute("imageinput:strict")) {
+            errorfmt("Possible corrupt file, could not decode ICC profile: {}\n",
+                     errormsg);
+            return false;
         }
     }
 

{openimageio-3.0.3.1 → openimageio-3.0.4.0}/src/libOpenImageIO/imagebuf.cpp

@@ -99,20 +99,20 @@ span_from_buffer(void* data, TypeDesc format, int nchannels, int width,
     if (xstride >= 0) {
         bufend += xstride * (width - 1);
     } else {
-        bufstart -= xstride * (width - 1);
+        bufstart += xstride * (width - 1);
     }
     // Expand to the span range for a whole image plane.
     if (ystride >= 0) {
         bufend += ystride * (height - 1);
     } else {
-        bufstart -= ystride * (height - 1);
+        bufstart += ystride * (height - 1);
     }
     // Expand to the span range for a whole volume.
     if (depth > 1 && zstride != 0) {
         if (zstride >= 0) {
             bufend += zstride * (depth - 1);
         } else {
-            bufstart -= zstride * (depth - 1);
+            bufstart += zstride * (depth - 1);
         }
     }
     return { bufstart, size_t(bufend - bufstart) };
@@ -189,7 +189,7 @@ public:
     TypeDesc pixeltype() const
     {
         validate_spec();
-        return m_localpixels ? m_spec.format : m_cachedpixeltype;
+        return cachedpixels() ? m_cachedpixeltype : m_spec.format;
     }
 
     DeepData* deepdata()
@@ -905,7 +905,7 @@ ImageBufImpl::set_bufspan_localpixels(span<std::byte> bufspan,
     }
     m_bufspan     = bufspan;
     m_localpixels = (char*)buforigin;
-    OIIO_DASSERT(check_span(m_bufspan, m_localpixels, spec().format));
+    OIIO_ASSERT(check_span(m_bufspan, m_localpixels, spec().format));
 }
 
 
@@ -1128,6 +1128,7 @@ ImageBufImpl::init_spec(string_view filename, int subimage, int miplevel,
         if (peltype != TypeDesc::UNKNOWN) {
             m_spec.format = (TypeDesc::BASETYPE)peltype;
             m_spec.channelformats.clear();
+            m_cachedpixeltype = m_spec.format;
         }
 
         if (m_nsubimages) {

{openimageio-3.0.3.1 → openimageio-3.0.4.0}/src/libOpenImageIO/imagebuf_test.cpp

@@ -300,6 +300,31 @@ ImageBuf_test_appbuffer_strided()
             }
         }
     }
+
+    // Test negative strides by filling with yellow, backwards
+    {
+        ImageBufAlgo::fill(wrapped, cspan<float>(green));
+        // Use the ImageBuf constructor from a pointer to the last pixel and
+        // negative strides. But don't include the edge pixels of the original
+        // buffer.
+        ImageBuf neg(ImageSpec(res - 2, res - 2, nchans, TypeFloat),
+                     &mem[res - 2][res - 2][0] /* point to last pixel */,
+                     -nchans * sizeof(float) /* negative x stride */,
+                     -res * nchans * sizeof(float) /* negative y stride*/);
+        const float yellow[nchans] = { 1.0f, 1.0f, 0.0f };
+        ImageBufAlgo::fill(neg, cspan<float>(yellow));
+
+        for (int y = 0; y < res; ++y) {
+            for (int x = 0; x < res; ++x) {
+                if (x == 0 || x == res - 1 || y == 0 || y == res - 1)
+                    OIIO_CHECK_ASSERT(make_cspan(mem[y][x], nchans)
+                                      == make_cspan(green));
+                else
+                    OIIO_CHECK_ASSERT(make_cspan(mem[y][x], nchans)
+                                      == make_cspan(yellow));
+            }
+        }
+    }
 }
 
 

{openimageio-3.0.3.1 → openimageio-3.0.4.0}/src/libutil/CMakeLists.txt

@@ -107,8 +107,6 @@ function (setup_oiio_util_library targetname)
     
     if (SKBUILD)
         set (PYTHON_SITE_DIR .)
-        set_target_properties (${targetname} PROPERTIES
-                INSTALL_RPATH "$<IF:$<BOOL:${APPLE}>,@loader_path,$ORIGIN>/${CMAKE_INSTALL_LIBDIR}")
         install_targets (NAMELINK_SKIP ${targetname})
     else ()
         install_targets (${targetname})

{openimageio-3.0.3.1 → openimageio-3.0.4.0}/src/oiiotool/expressions.cpp

@@ -317,6 +317,28 @@ Oiiotool::express_parse_atom(const string_view expr, string_view& s,
                 result = out.str();
                 if (result.size() && result.back() == '\n')
                     result.pop_back();
+            } else if (metadata == "IS_CONSTANT") {
+                std::vector<float> color((*img)(0, 0).nchannels());
+                if (ImageBufAlgo::isConstantColor((*img)(0, 0), 0.0f, color)) {
+                    result = "1";
+                } else {
+                    result = "0";
+                }
+            } else if (metadata == "IS_BLACK") {
+                std::vector<float> color((*img)(0, 0).nchannels());
+                // Check constant first to guard against false positive average of 0 with negative values i.e. -2, 1, 1
+                if (ImageBufAlgo::isConstantColor((*img)(0, 0), 0.0f, color)) {
+                    // trusting that the constantcolor check means all channels have the same value, so we only check the first channel
+                    if (color[0] == 0.0f) {
+                        result = "1";
+                    } else {
+                        result = "0";
+                    }
+                } else {
+                    // Not even constant color case -> We don't want those to count as black frames.
+                    result = "0";
+                }
+
             } else if (using_bracket) {
                 // For the TOP[meta] syntax, if the metadata doesn't exist,
                 // return the empty string, and do not make an error.

{openimageio-3.0.3.1 → openimageio-3.0.4.0}/src/oiiotool/oiiotool.cpp

@@ -7329,6 +7329,12 @@ handle_sequence(Oiiotool& ot, int argc, const char** argv)
         nfilenames = frame_numbers[0].size();
     }
 
+    if (!nfilenames) {
+        // No filenames matched the first wildcard pattern
+        ot.warning("", "No frame number or views matched the wildcards");
+        return false;
+    }
+
     // Make sure frame_numbers[0] has the canonical frame number list
     if (sequence_args.size() && frame_numbers[0].empty())
         frame_numbers[0] = frame_numbers[sequence_args[0]];

{openimageio-3.0.3.1 → openimageio-3.0.4.0}/src/openexr.imageio/exrinput.cpp

@@ -47,6 +47,7 @@ OIIO_GCC_PRAGMA(GCC diagnostic ignored "-Wunused-parameter")
 #include <OpenEXR/ImfInputPart.h>
 #include <OpenEXR/ImfIntAttribute.h>
 #include <OpenEXR/ImfKeyCodeAttribute.h>
+#include <OpenEXR/ImfLineOrderAttribute.h>
 #include <OpenEXR/ImfMatrixAttribute.h>
 #include <OpenEXR/ImfMultiPartInputFile.h>
 #include <OpenEXR/ImfPartType.h>
@@ -128,7 +129,6 @@ static std::map<std::string, std::string> exr_tag_to_oiio_std {
     { "envmap", "" },
     { "tiledesc", "" },
     { "tiles", "" },
-    { "openexr:lineOrder", "" },
     { "type", "" },
 
     // FIXME: Things to consider in the future:
@@ -467,6 +467,7 @@ OpenEXRInput::PartInfo::parse_header(OpenEXRInput* in,
         const Imf::V3dAttribute* v3dattr;
         const Imf::M33dAttribute* m33dattr;
         const Imf::M44dAttribute* m44dattr;
+        const Imf::LineOrderAttribute* lattr;
         const char* name = hit.name();
         auto found       = exr_tag_to_oiio_std.find(name);
         std::string oname(found != exr_tag_to_oiio_std.end() ? found->second
@@ -635,6 +636,18 @@ OpenEXRInput::PartInfo::parse_header(OpenEXRInput* in,
                         oname, n, d);
                 }
             }
+        } else if (type == "lineOrder"
+                   && (lattr
+                       = header->findTypedAttribute<Imf::LineOrderAttribute>(
+                           name))) {
+            const char* lineOrder = "increasingY";
+            switch (lattr->value()) {
+            case Imf::INCREASING_Y: lineOrder = "increasingY"; break;
+            case Imf::DECREASING_Y: lineOrder = "decreasingY"; break;
+            case Imf::RANDOM_Y: lineOrder = "randomY"; break;
+            default: break;
+            }
+            spec.attribute("openexr:lineOrder", lineOrder);
         } else {
 #if 0
             print(std::cerr, "  unknown attribute '{}' name '{}'\n",

{openimageio-3.0.3.1 → openimageio-3.0.4.0}/src/openexr.imageio/exrinput_c.cpp

@@ -275,7 +275,6 @@ static std::map<std::string, std::string> cexr_tag_to_oiio_std {
     { "envmap", "" },
     { "tiledesc", "" },
     { "tiles", "" },
-    { "openexr:lineOrder", "" },
     { "type", "" },
 
     // FIXME: Things to consider in the future:
@@ -729,12 +728,23 @@ OpenEXRCoreInput::PartInfo::parse_header(OpenEXRCoreInput* in,
             break;
         }
 
+        case EXR_ATTR_LINEORDER: {
+            std::string lineOrder = "increasingY";
+            switch (attr->uc) {
+            case EXR_LINEORDER_INCREASING_Y: lineOrder = "increasingY"; break;
+            case EXR_LINEORDER_DECREASING_Y: lineOrder = "decreasingY"; break;
+            case EXR_LINEORDER_RANDOM_Y: lineOrder = "randomY"; break;
+            default: break;
+            }
+            spec.attribute("openexr:lineOrder", lineOrder);
+            break;
+        }
+
         case EXR_ATTR_PREVIEW:
         case EXR_ATTR_OPAQUE:
         case EXR_ATTR_ENVMAP:
         case EXR_ATTR_COMPRESSION:
         case EXR_ATTR_CHLIST:
-        case EXR_ATTR_LINEORDER:
         case EXR_ATTR_TILEDESC:
         default:
 #if 0

{openimageio-3.0.3.1 → openimageio-3.0.4.0}/src/png.imageio/png_pvt.h

@@ -250,14 +250,12 @@ read_info(png_structp& sp, png_infop& ip, int& bit_depth, int& color_type,
                            TypeDesc(TypeDesc::UINT8, profile_length),
                            profile_data);
             std::string errormsg;
-            bool ok = decode_icc_profile(
-                cspan<uint8_t>((const uint8_t*)profile_data,
-                               span_size_t(profile_length)),
-                spec, errormsg);
-            if (!ok) {
-                // errorfmt("Could not decode ICC profile: {}\n", errormsg);
-                // return false;
-                // Nah, just skip an ICC specific error?
+            bool ok
+                = decode_icc_profile(make_cspan(profile_data, profile_length),
+                                     spec, errormsg);
+            if (!ok && OIIO::get_int_attribute("imageinput:strict")) {
+                errorfmt("Could not decode ICC profile: {}\n", errormsg);
+                return false;
             }
         }
     }

{openimageio-3.0.3.1 → openimageio-3.0.4.0}/src/psd.imageio/psdinput.cpp

@@ -1245,8 +1245,15 @@ PSDInput::load_resource_1039(uint32_t length)
     TypeDesc type(TypeDesc::UINT8, length);
     common_attribute("ICCProfile", type, icc_buf.get());
     std::string errormsg;
-    decode_icc_profile(cspan<uint8_t>(icc_buf.get(), length), m_common_attribs,
-                       errormsg);
+    bool ok = decode_icc_profile(cspan<uint8_t>(icc_buf.get(), length),
+                                 m_common_attribs, errormsg)
+              && decode_icc_profile(cspan<uint8_t>(icc_buf.get(), length),
+                                    m_composite_attribs, errormsg);
+    if (!ok && OIIO::get_int_attribute("imageinput:strict")) {
+        errorfmt("Possible corrupt file, could not decode ICC profile: {}\n",
+                 errormsg);
+        return false;
+    }
     return true;
 }
 

{openimageio-3.0.3.1 → openimageio-3.0.4.0}/src/rla.imageio/rlainput.cpp

@@ -604,7 +604,15 @@ RLAInput::decode_channel_group(int first_channel, short num_channels,
     // OIIO conventions.
     if (num_bits == 8 || num_bits == 16 || num_bits == 32) {
         // ok -- no rescaling needed
-    } else if (num_bits == 10) {
+    }
+    int bytes_per_chan = ceil2(std::max(int(num_bits), 8)) / 8;
+    if (size_t(offset + (m_spec.width - 1) * pixelsize
+               + num_channels * bytes_per_chan)
+        > m_buf.size()) {
+        errorfmt("Probably corrupt file (buffer overrun avoided)");
+        return false;  // Probably corrupt? Would have overrun
+    }
+    if (num_bits == 10) {
         // fast, common case -- use templated hard-code
         for (int x = 0; x < m_spec.width; ++x) {
             uint16_t* b = (uint16_t*)(&m_buf[offset + x * pixelsize]);

{openimageio-3.0.3.1 → openimageio-3.0.4.0}/src/tiff.imageio/tiffinput.cpp

@@ -209,7 +209,9 @@ private:
     // Read tags from the current directory of m_tif and fill out spec.
     // If read_meta is false, assume that m_spec already contains valid
     // metadata and should not be cleared or rewritten.
-    void readspec(bool read_meta = true);
+    // Return true if all is fine, false if something really bad happens,
+    // like we think the file is hopelessly corrupted.
+    bool readspec(bool read_meta = true);
 
     // Figure out all the photometric-related aspects of the header
     void readspec_photometric();
@@ -832,7 +834,8 @@ TIFFInput::seek_subimage(int subimage, int miplevel)
     m_next_scanline = 0;  // next scanline we'll read
     if (subimage == m_subimage || TIFFSetDirectory(m_tif, subimage)) {
         m_subimage = subimage;
-        readspec(read_meta);
+        if (!readspec(read_meta))
+            return false;
 
         char emsg[1024];
         if (m_use_rgba_interface && !TIFFRGBAImageOK(m_tif, emsg)) {
@@ -931,7 +934,7 @@ TIFFInput::spec_dimensions(int subimage, int miplevel)
 #define ICC_PROFILE_ATTR "ICCProfile"
 
 
-void
+bool
 TIFFInput::readspec(bool read_meta)
 {
     uint32_t width = 0, height = 0, depth = 0;
@@ -1201,7 +1204,7 @@ TIFFInput::readspec(bool read_meta)
     // assumed to be identical to what we already have in m_spec,
     // skip everything following.
     if (!read_meta)
-        return;
+        return true;
 
     short resunit = -1;
     TIFFGetField(m_tif, TIFFTAG_RESOLUTIONUNIT, &resunit);
@@ -1239,8 +1242,13 @@ TIFFInput::readspec(bool read_meta)
         m_spec.attribute(ICC_PROFILE_ATTR,
                          TypeDesc(TypeDesc::UINT8, icc_datasize), icc_buf);
         std::string errormsg;
-        decode_icc_profile(cspan<uint8_t>(icc_buf, icc_datasize), m_spec,
-                           errormsg);
+        bool ok = decode_icc_profile(cspan<uint8_t>(icc_buf, icc_datasize),
+                                     m_spec, errormsg);
+        if (!ok && OIIO::get_int_attribute("imageinput:strict")) {
+            errorfmt("Possible corrupt file, could not decode ICC profile: {}\n",
+                     errormsg);
+            return false;
+        }
     }
 
     // Search for an EXIF IFD in the TIFF file, and if found, rummage
@@ -1370,6 +1378,8 @@ TIFFInput::readspec(bool read_meta)
 
     if (m_testopenconfig)  // open-with-config debugging
         m_spec.attribute("oiio:DebugOpenConfig!", 42);
+
+    return true;
 }