OpenEXR 3.4.0__tar.gz → 3.4.3__tar.gz

openexr-3.4.3/.bazelversion

@@ -0,0 +1 @@
+8.4.2

{openexr-3.4.0 → openexr-3.4.3}/BUILD.bazel

@@ -13,7 +13,7 @@ expand_template(
     name = "IexConfig",
     out = "src/lib/Iex/IexConfig.h",
     substitutions = {
-        "@IEX_INTERNAL_NAMESPACE@": "Iex_3_3",
+        "@IEX_INTERNAL_NAMESPACE@": "Iex_3_4",
         "@IEX_NAMESPACE_CUSTOM@": "0",
         "@IEX_NAMESPACE@": "Iex",
     },
@@ -35,7 +35,7 @@ expand_template(
     name = "IlmThreadConfig",
     out = "src/lib/IlmThread/IlmThreadConfig.h",
     substitutions = {
-        "@ILMTHREAD_INTERNAL_NAMESPACE@": "IlmThread_3_3",
+        "@ILMTHREAD_INTERNAL_NAMESPACE@": "IlmThread_3_4",
         "@ILMTHREAD_NAMESPACE_CUSTOM@": "0",
         "@ILMTHREAD_NAMESPACE@": "IlmThread",
         "#cmakedefine01 ILMTHREAD_HAVE_POSIX_SEMAPHORES": "#define ILMTHREAD_HAVE_POSIX_SEMAPHORES 0",
@@ -50,14 +50,14 @@ expand_template(
     out = "src/lib/OpenEXR/OpenEXRConfig.h",
     substitutions = {
         "@OPENEXR_IMF_NAMESPACE@": "Imf",
-        "@OPENEXR_INTERNAL_IMF_NAMESPACE@": "Imf_3_3",
-        "@OPENEXR_LIB_VERSION@": "3.3.0",
-        "@OPENEXR_NAMESPACE_CUSTOM@": "3.3.0",
-        "@OPENEXR_PACKAGE_NAME@": "OpenEXR 3.3.0",
+        "@OPENEXR_INTERNAL_IMF_NAMESPACE@": "Imf_3_4",
+        "@OPENEXR_LIB_VERSION@": "3.4.0",
+        "@OPENEXR_NAMESPACE_CUSTOM@": "3.4.0",
+        "@OPENEXR_PACKAGE_NAME@": "OpenEXR 3.4.0",
         "@OPENEXR_VERSION_EXTRA@": "",
-        "@OPENEXR_VERSION@": "3.3.0",
+        "@OPENEXR_VERSION@": "3.4.0",
         "@OPENEXR_VERSION_MAJOR@": "3",
-        "@OPENEXR_VERSION_MINOR@": "3",
+        "@OPENEXR_VERSION_MINOR@": "4",
         "@OPENEXR_VERSION_PATCH@": "0",
         "#cmakedefine OPENEXR_ENABLE_API_VISIBILITY": "#define OPENEXR_ENABLE_API_VISIBILITY",
         "#cmakedefine OPENEXR_HAVE_LARGE_STACK 1": "/* #undef OPENEXR_HAVE_LARGE_STACK */",

{openexr-3.4.0 → openexr-3.4.3}/CHANGES.md

@@ -3,6 +3,9 @@
 
 # OpenEXR Release Notes
 
+* [Version 3.4.3](#version-343-november-4-2025) November 4, 2025
+* [Version 3.4.2](#version-342-october-15-2025) October 15, 2025
+* [Version 3.4.1](#version-341-october-8-2025) October 8, 2025
 * [Version 3.4.0](#version-340-september-5-2025) September 5, 2025
 * [Version 3.3.5](#version-335-july-26-2025) July 26, 2025
 * [Version 3.3.4](#version-334-june-9-2025) June 9, 2025
@@ -81,6 +84,130 @@
 * [Version 1.0.1](#version-101)
 * [Version 1.0](#version-10)
 
+## Version 3.4.3 (November 4, 2025)
+
+Patch release that addresses several bugs, primarily involving
+properly rejecting corrupt input data.
+
+Specifically:
+
+* Buffer overflow in PyOpenEXR_old's `channels()` and `channel()` in
+  legacy python, reported by Joshua Rogers (GitHub: MegaManSec).
+* Use after free in PyObject_StealAttrString in legacy python, reported
+  by Joshua Rogers (GitHub: MegaManSec).
+* Use of Uninitialized Memory in openexr, reported by Aldo Ristori
+  (GitHub: Kaldreic).
+* Heap-based Buffer Overflow Remote Code Execution Vulnerability,
+  reported by Trend Micro Zero Day Initiative.
+
+Also:
+
+* OSS-fuzz [456158449](https://issues.oss-fuzz.com/issues/456158449)
+Heap-buffer-overflow in `generic_unpack`
+* OSS-fuzz [447429458](https://issues.oss-fuzz.com/issues/447429458)
+Heap-buffer-overflow in `DwaCompressor_uncompress`
+* OSS-fuzz [439237843](https://issues.oss-fuzz.com/issues/439237843)
+Heap-buffer-overflow in `internal_exr_undo_ht`
+* OSS-fuzz [436037111](https://issues.oss-fuzz.com/issues/436037111)
+Heap-buffer-overflow in `generic_unpack`
+* OSS-fuzz [435779241](https://issues.oss-fuzz.com/issues/435779241)
+Heap-buffer-overflow in `generic_unpack`
+* OSS-fuzz [420744464](https://issues.oss-fuzz.com/issues/420744464)
+Abrt in `__cxxabiv1::failed_throw`
+
+Other fixes:
+* Fix a bug with re-reading a scanline file with a different set of
+  channels.
+* Only populate `CMAKE_DEBUG_POSTFIX` with `_d` if it is undefined,
+  which makes it possible to set `CMAKE_DEBUG_POSTFIX=""`.
+
+This version also bumps the auto-fetched version of OpenJPH to
+0.24.5. OpenJPH 0.24.5 addresses these OSS-Fuzz issues:
+		
+* OSS-fuzz [456837230](https://issues.oss-fuzz.com/issues/456837230)
+Crash in `ojph::local::param_cod::~param_cod`
+* OSS-fuzz [456248580](https://issues.oss-fuzz.com/issues/456248580)
+Null-dereference READ in `ojph::local::param_cod::~param_cod`
+* OSS-fuzz [455374208](https://issues.oss-fuzz.com/issues/455374208)
+Floating-point-exception in `ojph::local::tile::pre_alloc`
+* OSS-fuzz [444963190](https://issues.oss-fuzz.com/issues/444963190)
+Index-out-of-bounds in `ojph::local::param_qcd::read_qcc`
+* OSS-fuzz [444889300](https://issues.oss-fuzz.com/issues/444889300)
+Heap-buffer-overflow in `ojph::mem_infile::read`
+* OSS-fuzz [444878558](https://issues.oss-fuzz.com/issues/444878558)
+Segv on unknown address in `ojph::local::param_qcd::~param_qcd`
+* OSS-fuzz [444878557](https://issues.oss-fuzz.com/issues/444878557)
+Null-dereference READ in `ojph::local::param_qcd::~param_qcd`
+
+### Merged Pull Requests:
+
+* [2168](https://github.com/AcademySoftwareFoundation/openexr/pull/2168)
+ Fix improper use of `Py_DECREF` in legacy python module
+* [2166](https://github.com/AcademySoftwareFoundation/openexr/pull/2166)
+Only define `CMAKE_DEBUG_POSTFIX` if it is not already defined
+* [2164](https://github.com/AcademySoftwareFoundation/openexr/pull/2164)
+check storage_mode when computing chunk sizes
+* [2163](https://github.com/AcademySoftwareFoundation/openexr/pull/2163)
+Check for image size overflow in legacy python module
+* [2162](https://github.com/AcademySoftwareFoundation/openexr/pull/2162)
+verify packed/unpacked size with uncompressed data
+* [2161](https://github.com/AcademySoftwareFoundation/openexr/pull/2161)
+ImfCheckFile: handle partial deep tiles
+* [2160](https://github.com/AcademySoftwareFoundation/openexr/pull/2160)
+Fix issues with negative coordinates and sampling != 0
+* [2159](https://github.com/AcademySoftwareFoundation/openexr/pull/2159)
+Fix memset in `exr_read_chunk` when nread is negative
+* [2156](https://github.com/AcademySoftwareFoundation/openexr/pull/2156)
+Fix handling of corrupt RLE data
+* [2150](https://github.com/AcademySoftwareFoundation/openexr/pull/2150)
+Fix bug with re-reading scanline file with a different set of channels
+
+
+## Version 3.4.2 (October 15, 2025)
+
+Patch release that fixes a Windows build issue introduced in v3.4.1.
+
+This version also bumps the auto-fetched Imath version to v3.2.2,
+which resolves a build problem with newer versions of cmake, involving
+duplicate library aliases.
+
+No change in functionality.
+
+### Merged Pull Requests:
+
+* [2146](https://github.com/AcademySoftwareFoundation/openexr/pull/2146)
+Update Bazel dependencies
+* [2144](https://github.com/AcademySoftwareFoundation/openexr/pull/2144)
+handle CMake CREATE_LINK failures for openjph headers
+
+## Version 3.4.1 (October 8, 2025)
+
+Patch release that fixes a build issue: OpenJPH headers are now
+included from the openjph folder, as required by OpenJPH 0.23+.
+
+No change in functionality.
+
+### Merged Pull Requests:
+
+* [2140](https://github.com/AcademySoftwareFoundation/openexr/pull/2140)
+Update `HELP2MAN_URL` in `install_help2man.sh`
+* [2139](https://github.com/AcademySoftwareFoundation/openexr/pull/2139)
+Fix doxygen/sphinx/rst website issues
+* [2138](https://github.com/AcademySoftwareFoundation/openexr/pull/2138)
+Bazel cleanup
+* [2137](https://github.com/AcademySoftwareFoundation/openexr/pull/2137)
+Bump macos runners to 14 and 15, drop 13
+* [2136](https://github.com/AcademySoftwareFoundation/openexr/pull/2136)
+Include the openjph headers from the openjph folder, required for OpenJPH 0.23+
+* [2127](https://github.com/AcademySoftwareFoundation/openexr/pull/2127)
+cmake: remove trailing spaces
+* [2119](https://github.com/AcademySoftwareFoundation/openexr/pull/2119)
+News for v3.4.0 release
+* [2118](https://github.com/AcademySoftwareFoundation/openexr/pull/2118)
+fix formatting in release notes
+* [2107](https://github.com/AcademySoftwareFoundation/openexr/pull/2107)
+Add section on OpenEXR/Imath version compatibility to install instructions
+
 ## Version 3.4.0 (September 5, 2025)
 
 OpenEXR v3.4 introduces a new, additional compression option to the

{openexr-3.4.0 → openexr-3.4.3}/CMakeLists.txt

@@ -87,10 +87,10 @@ if(OPENEXR_BUILD_TOOLS AND OPENEXR_BUILD_LIBS)
   add_subdirectory(src/bin)
 endif()
 
-# Tell CMake where to find the OpenEXRConfig.cmake file. Makes it possible to call 
+# Tell CMake where to find the OpenEXRConfig.cmake file. Makes it possible to call
 # find_package(OpenEXR) in downstream projects
 set(OpenEXR_DIR "${CMAKE_CURRENT_BINARY_DIR}/cmake" CACHE PATH "" FORCE)
-# Add an empty OpenEXRTargets.cmake file for the config to use. 
+# Add an empty OpenEXRTargets.cmake file for the config to use.
 # Can be empty since we already defined the targets in add_subdirectory
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cmake/OpenEXRTargets.cmake" "# Dummy file")
 
@@ -102,7 +102,7 @@ endif()
 # upload the results, cmake has builtin support for
 # submitting to CDash, or any server who speaks the
 # same protocol
-# 
+#
 # These settings will need to be set for your environment,
 # and then a script such as the example in
 #
@@ -113,7 +113,7 @@ endif()
 # cmake -S cmake/SampleCTestScript.cmake
 #
 # [or whatever you name the file you edit]
-# 
+#
 #set(CTEST_PROJECT_NAME "OpenEXR")
 #set(CTEST_NIGHTLY_START_TIME "01:01:01 UTC")
 #set(CTEST_DROP_METHOD "http") # there are others...

openexr-3.4.3/MODULE.bazel

@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
+
+module(
+    name = "openexr",
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.8.2")
+bazel_dep(name = "imath", version = "3.2.2")
+bazel_dep(name = "libdeflate", version = "1.24")
+bazel_dep(name = "openjph", version = "0.24.2")
+bazel_dep(name = "platforms", version = "1.0.0")
+bazel_dep(name = "rules_cc", version = "0.2.9")

{openexr-3.4.0 → openexr-3.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: OpenEXR
-Version: 3.4.0
+Version: 3.4.3
 Summary: Python bindings for the OpenEXR image file format
 Author-Email: Contributors to the OpenEXR project <info@openexr.com>
 Project-URL: Homepage, https://openexr.com

{openexr-3.4.0 → openexr-3.4.3}/cmake/OpenEXRSetup.cmake

@@ -100,7 +100,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 # Suffix for debug configuration libraries
 # (if you should choose to install those)
 # Don't override if the user has set it and don't save it in the cache
-if (NOT CMAKE_DEBUG_POSTFIX)
+if (NOT DEFINED CMAKE_DEBUG_POSTFIX)
   set(CMAKE_DEBUG_POSTFIX "_d")
 endif()
 
@@ -257,7 +257,7 @@ endif()
 
 option(OPENEXR_FORCE_INTERNAL_OPENJPH "Force downloading OpenJPH from a git repo" OFF)
 set(OPENEXR_OPENJPH_REPO "https://github.com/aous72/OpenJPH.git" CACHE STRING "OpenJPH git repo URI")
-set(OPENEXR_OPENJPH_TAG "0.22.0" CACHE STRING "OpenJPH git repo tag")
+set(OPENEXR_OPENJPH_TAG "0.24.5" CACHE STRING "OpenJPH git repo tag")
 
 if (NOT OPENEXR_FORCE_INTERNAL_OPENJPH)
   find_package(openjph CONFIG QUIET)
@@ -265,6 +265,7 @@ if (NOT OPENEXR_FORCE_INTERNAL_OPENJPH)
     if(openjph_VERSION VERSION_LESS "0.21.0")
         message(FATAL_ERROR "OpenJPH >= 0.21.0 required, but found ${openjph_VERSION}")
     endif()
+
     message(STATUS "Using OpenJPH ${openjph_VERSION} from ${openjph_DIR}")
     set(EXR_OPENJPH_LIB openjph)
   else()
@@ -308,7 +309,33 @@ if(NOT EXR_OPENJPH_LIB)
     POSITION_INDEPENDENT_CODE ON
     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
   )
-  include_directories("${openjph_SOURCE_DIR}/src/core/common")
+
+  # OpenEXR expects OpenJPH headers to live in an openjph folder,
+  # so OpenEXR's include looks like:
+  #   #include <openjph/openjph_arch.h>
+  # However, when building OpenJPH via FetchContent, the headers
+  # reside in src/core/common directory in the OpenJPH source tree.
+  # Create a symlink called "openjph" that points to "common", so the
+  # OpenEXR includes see the files they expect.
+  # Then add that as the include directory.
+  #
+  # NOTE: This can go away when we vendor in the OpenJPH code and
+  # retire the FetchContent altogether.
+  file(CREATE_LINK
+    "${openjph_SOURCE_DIR}/src/core/common"
+    "${openjph_SOURCE_DIR}/src/core/openjph"
+    RESULT openjph_create_link_result
+    SYMBOLIC
+  )
+  # Creating a symlink may fail, for example on Windows without developer
+  # mode enabled, so fallback to copying in that case.
+  if (NOT openjph_create_link_result EQUAL 0)
+    file(COPY
+      "${openjph_SOURCE_DIR}/src/core/common/"
+      DESTINATION "${openjph_SOURCE_DIR}/src/core/openjph"
+    )
+  endif()
+  include_directories("${openjph_SOURCE_DIR}/src/core")
 
   # extract the openjph version variables from ojph_version.h
   set(openjph_version "${openjph_SOURCE_DIR}/src/core/common/ojph_version.h")
@@ -328,6 +355,23 @@ if (NOT EXR_OPENJPH_LIB)
   message(ERROR "Failed to find OpenJPH")
 endif()
 
+if (openjph_VERSION VERSION_LESS "0.23")
+  # OpenJPH 0.22 and before incorrectly appends "openjph" to INTERFACE_INCLUDE_DIRECTORIES
+  # so OpenEXR's "#include <openjph/ojph_arch.h>" does not work.
+  # Strip the "openjph" from the setting in this case. This allows the
+  # #include statements in OpenEXRCore/internal_ht.cpp  to work properly for all openjph versions.
+  get_target_property(OPENJPH_INCLUDE_DIR openjph INTERFACE_INCLUDE_DIRECTORIES)
+  if (NOT OPENJPH_INCLUDE_DIR)
+    message(FATAL_ERROR "failed to set openjph header directory, version ${openjph_VERSION}")
+  endif()
+  string(REGEX REPLACE "/openjph/?$" "" OPENJPH_PARENT_INCLUDE_DIR "${OPENJPH_INCLUDE_DIR}")
+  set_target_properties(openjph PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES "${OPENJPH_PARENT_INCLUDE_DIR}"
+  )
+  unset(OPENJPH_INCLUDE_DIR)
+  unset(OPENJPH_PARENT_INCLUDE_DIR)
+endif()
+
 set(EXR_OPENJPH_PKGCONFIG_REQUIRES "openjph >= 0.21.0")
 
 #######################################
@@ -337,7 +381,7 @@ set(EXR_OPENJPH_PKGCONFIG_REQUIRES "openjph >= 0.21.0")
 option(OPENEXR_FORCE_INTERNAL_IMATH "Force using an internal imath" OFF)
 # Check to see if Imath is installed outside of the current build directory.
 set(OPENEXR_IMATH_REPO "https://github.com/AcademySoftwareFoundation/Imath.git" CACHE STRING "Repo for auto-build of Imath")
-set(OPENEXR_IMATH_TAG "v3.2.1" CACHE STRING "Tag for auto-build of Imath (branch, tag, or SHA)")
+set(OPENEXR_IMATH_TAG "v3.2.2" CACHE STRING "Tag for auto-build of Imath (branch, tag, or SHA)")
 if(NOT OPENEXR_FORCE_INTERNAL_IMATH)
   #TODO: ^^ Release should not clone from main, this is a place holder
   set(CMAKE_IGNORE_PATH "${CMAKE_CURRENT_BINARY_DIR}/_deps/imath-src/config;${CMAKE_CURRENT_BINARY_DIR}/_deps/imath-build/config")

{openexr-3.4.0 → openexr-3.4.3}/src/lib/OpenEXR/ImfScanLineInputFile.cpp

@@ -244,6 +244,7 @@ ScanLineInputFile::setFrameBuffer (const FrameBuffer& frameBuffer)
     std::lock_guard<std::mutex> lock (_data->_mx);
 #endif
     _data->fill_list.clear ();
+    _data->singleScan.reset();
 
     for (FrameBuffer::ConstIterator j = frameBuffer.begin ();
          j != frameBuffer.end ();

{openexr-3.4.0 → openexr-3.4.3}/src/lib/OpenEXRCore/chunk.c

@@ -1486,6 +1486,18 @@ exr_read_tile_chunk_info (
         return ctxt->report_error (
             ctxt, EXR_ERR_INVALID_ARGUMENT, "Invalid packed size of 0");
 
+    if (part->comp_type == EXR_COMPRESSION_NONE &&
+       cinfo->packed_size != cinfo->unpacked_size)
+    {
+         return ctxt->print_error (
+             ctxt,
+             EXR_ERR_BAD_CHUNK_LEADER,
+             "Mismatch between unpacked and packed size with uncompressed data: packed is %" PRIu64 "; unpacked is %" PRIu64,
+             cinfo->packed_size, cinfo->unpacked_size);
+    }
+
+
+
     return EXR_ERR_SUCCESS;
 }
 
@@ -1544,11 +1556,15 @@ exr_read_chunk (
         rv    = ctxt->do_read (
             ctxt, packed_data, toread, &dataoffset, &nread, rmode);
 
-        if (rmode == EXR_ALLOW_SHORT_READ && nread < (int64_t) toread)
-            memset (
-                ((uint8_t*) packed_data) + nread,
-                0,
-                toread - (uint64_t) (nread));
+        if (rmode == EXR_ALLOW_SHORT_READ &&
+            nread >= 0 &&
+            nread < (int64_t) toread)
+            {
+                memset (
+                    ((uint8_t*) packed_data) + nread,
+                        0,
+                (size_t)(toread - (uint64_t)nread));
+            }
     }
     else
         rv = EXR_ERR_SUCCESS;

{openexr-3.4.0 → openexr-3.4.3}/src/lib/OpenEXRCore/internal_ht.cpp

@@ -7,12 +7,12 @@
 #include <string>
 #include <fstream>
 
-#include <ojph_arch.h>
-#include <ojph_file.h>
-#include <ojph_params.h>
-#include <ojph_mem.h>
-#include <ojph_codestream.h>
-#include <ojph_message.h>
+#include <openjph/ojph_arch.h>
+#include <openjph/ojph_file.h>
+#include <openjph/ojph_params.h>
+#include <openjph/ojph_mem.h>
+#include <openjph/ojph_codestream.h>
+#include <openjph/ojph_message.h>
 
 #include "openexr_decode.h"
 #include "openexr_encode.h"
@@ -56,12 +56,12 @@ class staticmem_outfile : public ojph::outfile_base
 
     /**  
      *  @brief Call this function to write data to the memory file.
-	   *
+     *
      *  This function adds new data to the memory file.  The memory buffer
      *  of the file grows as needed.
      *
      *  @param ptr is a pointer to new data.
-     *  @param size the number of bytes in the new data.
+     *  @param sz the number of bytes in the new data.
      */
     size_t write (const void* ptr, size_t sz) override
     {

{openexr-3.4.0 → openexr-3.4.3}/src/lib/OpenEXRCore/internal_rle.c

@@ -219,7 +219,7 @@ internal_exr_undo_rle (
 
     unpackb =
         internal_rle_decompress (decode->scratch_buffer_1, outsz, src, packsz);
-    if (packsz > 0 && unpackb == 0)
+    if (unpackb != outsz)
         return EXR_ERR_CORRUPT_CHUNK;
 
     unpredict_and_reorder (out, decode->scratch_buffer_1, unpackb);

{openexr-3.4.0 → openexr-3.4.3}/src/lib/OpenEXRCore/internal_util.h

@@ -30,11 +30,12 @@ compute_sampled_height (int height, int y_sampling, int start_y)
             start = start_y + (y_sampling - start);
         else
             start = start_y;
+
         end = start_y + height - 1;
-        end -= (end < 0) ? (-end % y_sampling) : (end % y_sampling);
+        end -= (end < 0 ? -end : end) % y_sampling;
 
         if (start > end)
-            nlines = 0;
+            nlines = start == start_y ? 1 : 0;
         else
             nlines = (end - start) / y_sampling + 1;
     }

{openexr-3.4.0 → openexr-3.4.3}/src/lib/OpenEXRCore/openexr_version.h

@@ -10,6 +10,6 @@
 
 #    define OPENEXR_VERSION_MAJOR 3
 #    define OPENEXR_VERSION_MINOR 4
-#    define OPENEXR_VERSION_PATCH 0
+#    define OPENEXR_VERSION_PATCH 3
 
 #endif

{openexr-3.4.0 → openexr-3.4.3}/src/lib/OpenEXRCore/parse_header.c

@@ -761,7 +761,6 @@ extract_attr_bytes(
     int32_t n;
     int32_t hint_length;
     size_t bytes_length;
-    const char* type_hint;
     exr_result_t rv;
 
     rv = check_bad_attrsz(scratch, attrsz, 1, aname, tname, &n);
@@ -2493,7 +2492,9 @@ internal_exr_compute_chunk_offset_size (exr_priv_part_t curpart)
 
     w = (uint64_t) (((int64_t) dw.max.x) - ((int64_t) dw.min.x) + 1);
 
-    if (curpart->tiles)
+    if (curpart->storage_mode != EXR_STORAGE_SCANLINE &&
+       curpart->storage_mode != EXR_STORAGE_DEEP_SCANLINE &&
+       curpart->tiles)
     {
         const exr_attr_tiledesc_t* tiledesc  = curpart->tiles->tiledesc;
         int64_t                    tilecount = 0;

{openexr-3.4.0 → openexr-3.4.3}/src/lib/OpenEXRUtil/ImfCheckFile.cpp

@@ -694,15 +694,24 @@ readDeepTile (T& in, bool reduceMemory, bool reduceTime)
                             try
                             {
 
+
                                 in.readPixelSampleCounts (
                                     x, y, x, y, xlevel, ylevel);
 
                                 size_t bufferSize     = 0;
                                 size_t fileBufferSize = 0;
 
-                                for (int ty = 0; ty < tileHeight; ++ty)
+                                Box2i tileRange =
+                                    in.dataWindowForTile (x, y, xlevel, ylevel);
+
+                                int thisTileWidth =
+                                    tileRange.max.x - tileRange.min.x + 1;
+                                int thisTileHeight =
+                                    tileRange.max.y - tileRange.min.y + 1;
+
+                                for (int ty = 0; ty < thisTileHeight; ++ty)
                                 {
-                                    for (int tx = 0; tx < tileWidth; ++tx)
+                                    for (int tx = 0; tx < thisTileWidth; ++tx)
                                     {
                                         fileBufferSize +=
                                             channelCount *
@@ -731,9 +740,10 @@ readDeepTile (T& in, bool reduceMemory, bool reduceTime)
                                     pixelBuffer.resize (bufferSize);
                                     size_t bufferIndex = 0;
 
-                                    for (int ty = 0; ty < tileHeight; ++ty)
+                                    for (int ty = 0; ty < thisTileHeight; ++ty)
                                     {
-                                        for (int tx = 0; tx < tileWidth; ++tx)
+                                        for (int tx = 0; tx < thisTileWidth;
+                                             ++tx)
                                         {
                                             if (!reduceMemory ||
                                                 localSampleCount[ty][tx] *

{openexr-3.4.0 → openexr-3.4.3}/src/test/OpenEXRTest/testScanLineApi.cpp

@@ -18,6 +18,11 @@
 #include <ImfTiledInputFile.h>
 #include <ImfTiledOutputFile.h>
 #include <ImfTiledRgbaFile.h>
+#include <ImfOutputFile.h>
+#include <ImfFrameBuffer.h>
+#include <ImfStdIO.h>
+#include <ImfHeader.h>
+#include <iostream>
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
@@ -734,11 +739,82 @@ writeRead (
         true);
 }
 
+int
+testReread()
+{
+    //
+    // Test reading a file then rereading with different channels, with
+    // 32-bit channels.
+    //
+
+    int width  = 10;
+    int height = 10;
+
+    std::vector<float> R(width * height, 0.0f);
+    std::vector<float> G(width * height, 0.0f);
+    std::vector<float> B(width * height, 0.0f);
+
+    const char* path = "reread32.exr";
+
+    try {
+        Header header(width, height);
+        header.compression() = PIZ_COMPRESSION;
+        header.channels().insert("R", Channel(FLOAT));
+        header.channels().insert("G", Channel(FLOAT));
+        header.channels().insert("B", Channel(FLOAT));
+
+        OutputFile file(path, header);
+        FrameBuffer fb;
+        fb.insert("R", Slice(FLOAT, (char*)&R[0], sizeof(float), sizeof(float) * width));
+        fb.insert("G", Slice(FLOAT, (char*)&G[0], sizeof(float), sizeof(float) * width));
+        fb.insert("B", Slice(FLOAT, (char*)&B[0], sizeof(float), sizeof(float) * width));
+
+        file.setFrameBuffer(fb);
+        file.writePixels(height);
+
+    } catch (const std::exception &e) {
+        std::cerr << "Error writing image file " << path << ": " << e.what() << std::endl;
+        return 1;
+    }
+
+    InputFile inFile(path);
+
+    auto dw = inFile.header().dataWindow();
+
+    int numChannels = 3;
+    size_t chanBytes = sizeof(float);
+    size_t pixBytes  = numChannels * chanBytes;
+    size_t rowBytes  = width * pixBytes;
+    std::vector<float> exr_RGB(width * height * numChannels);
+
+    // Read RGB
+    {
+	FrameBuffer frameBuffer;
+	frameBuffer.insert("R", Slice(FLOAT, (char*) exr_RGB.data() + (chanBytes * 0), pixBytes, rowBytes, 1, 1, 0.0) );
+	frameBuffer.insert("G", Slice(FLOAT, (char*) exr_RGB.data() + (chanBytes * 1), pixBytes, rowBytes, 1, 1, 0.0) );
+	frameBuffer.insert("B", Slice(FLOAT, (char*) exr_RGB.data() + (chanBytes * 2), pixBytes, rowBytes, 1, 1, 0.0) );
+	inFile.setFrameBuffer(frameBuffer);
+	inFile.readPixels(dw.min.y, dw.max.y);
+    }
+
+    // Reread just R
+    {
+	FrameBuffer frameBuffer;
+	frameBuffer.insert("R", Slice(FLOAT, (char*) exr_RGB.data() + (chanBytes * 0), pixBytes, rowBytes, 1, 1, 0.0) );
+	inFile.setFrameBuffer(frameBuffer);
+	inFile.readPixels(dw.min.y, dw.max.y);
+    }
+
+    return 0;
+}
+
 } // namespace
 
 void
 testScanLineApi (const std::string& tempDir)
 {
+    testReread();
+
     try
     {
         cout << "Testing the scanline API for tiled files" << endl;

{openexr-3.4.0 → openexr-3.4.3}/src/wrappers/python/Imath.py

@@ -154,7 +154,7 @@ class TimeCode:
 
     def __repr__(self):
         # ignoring binaryGroups for now
-        return "<Imath.TimeCode instance { time: %s:%s:%s:%s, dropFrame: %s, colorFrame: %s, fieldPhase: %s, bgf0: %s, bgf1: %s, bgf2: %s" % (self.hours, self.minutes, self.seconds, self.frame, self.dropFrame, self.colorFrame, self.fieldPhase, self.bgf0, self.bgf1, self.bgf2)
+        return "<Imath.TimeCode instance { time: %s:%s:%s:%s, dropFrame: %s, colorFrame: %s, fieldPhase: %s, bgf0: %s, bgf1: %s, bgf2: %s }" % (self.hours, self.minutes, self.seconds, self.frame, self.dropFrame, self.colorFrame, self.fieldPhase, self.bgf0, self.bgf1, self.bgf2)
 
     def __eq__(self, other): 
         return self.__dict__ == other.__dict__
@@ -195,4 +195,7 @@ class TileDescription:
         self.mode = m
         self.roundingMode = r
     def __repr__(self):
-        return "<Imath.TileDescription instance %dx%d %s %s>" % (self.xSize, self.ySize, repr(self.mode), repr(self.roundingMode))
+        return "<Imath.TileDescription instance { xSize: %s, ySize: %s, mode: %s, roundingMode: %s>" % (self.xSize, self.ySize, repr(self.mode), repr(self.roundingMode))
+    def __eq__(self, other): 
+        return self.__dict__ == other.__dict__
+