Merge branch 'AcademySoftwareFoundation:main' into CUDA

1div0 · web-flow · commit f811954a54be · 2026-01-20T17:05:36.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -461,7 +461,7 @@ jobs:
             simd: avx2,f16c
             setenvs: export LIBJPEGTURBO_VERSION=3.1.2
                             LIBPNG_VERSION=v1.6.50
-                            LIBRAW_VERSION=0.21.5
+                            LIBRAW_VERSION=0.22.0
                             LIBTIFF_VERSION=v4.7.1
                             OPENJPEG_VERSION=v2.5.4
                             PTEX_VERSION=v2.5.0
@@ -514,7 +514,7 @@ jobs:
             simd: avx2,f16c
             setenvs: export OpenImageIO_BUILD_LOCAL_DEPS=all
                             OpenImageIO_DEPENDENCY_BUILD_VERBOSE=ON
-                            LIBRAW_VERSION=0.21.5
+                            LIBRAW_VERSION=0.22.0
                             PTEX_VERSION=v2.4.2
                             PUGIXML_VERSION=v1.14
                             WEBP_VERSION=v1.4.0
@@ -545,7 +545,7 @@ jobs:
             python_ver: "3.12"
             setenvs: export LIBJPEGTURBO_VERSION=3.1.2
                             LIBPNG_VERSION=v1.6.50
-                            LIBRAW_VERSION=0.21.5
+                            LIBRAW_VERSION=0.22.0
                             LIBTIFF_VERSION=v4.7.1
                             OPENJPEG_VERSION=v2.5.4
                             PTEX_VERSION=v2.4.3
@@ -566,7 +566,7 @@ jobs:
             python_ver: "3.12"
             setenvs: export LIBJPEGTURBO_VERSION=3.1.2
                             LIBPNG_VERSION=v1.6.50
-                            LIBRAW_VERSION=0.21.5
+                            LIBRAW_VERSION=0.22.0
                             LIBTIFF_VERSION=v4.7.1
                             OPENJPEG_VERSION=v2.5.4
                             PTEX_VERSION=v2.4.3
@@ -695,13 +695,13 @@ jobs:
             nametag: windows-2022
             vsver: 2022
             generator: "Visual Studio 17 2022"
-            python_ver: "3.9"
+            python_ver: "3.12"
             setenvs: export OPENIMAGEIO_PYTHON_LOAD_DLLS_FROM_PATH=1
           - desc: Windows-2025 VS2022
             runner: windows-2025
             nametag: windows-2025
             vsver: 2022
             generator: "Visual Studio 17 2022"
-            python_ver: "3.9"
+            python_ver: "3.12"
             setenvs: export OPENIMAGEIO_PYTHON_LOAD_DLLS_FROM_PATH=1
             benchmark: 1
diff --git a/INSTALL.md b/INSTALL.md
@@ -45,7 +45,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
  * If you want support for PNG files:
      * libPNG >= 1.6.0 (tested though 1.6.50)
  * If you want support for camera "RAW" formats:
-     * LibRaw >= 0.20 (tested though 0.21.5 and master)
+     * LibRaw >= 0.20 (tested though 0.22.0 and master)
  * If you want support for a wide variety of video formats:
      * ffmpeg >= 4.0 (tested through 8.0)
  * If you want support for jpeg 2000 images:
diff --git a/src/build-scripts/gh-win-installdeps.bash b/src/build-scripts/gh-win-installdeps.bash
@@ -32,6 +32,10 @@ elif [[ "$PYTHON_VERSION" == "3.9" ]] ; then
     export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;/c/hostedtoolcache/windows/Python/3.9.13/x64"
     export Python_EXECUTABLE="/c/hostedtoolcache/windows/Python/3.9.13/x64/python3.exe"
     export PYTHONPATH=$OpenImageIO_ROOT/lib/python${PYTHON_VERSION}/site-packages
+elif [[ "$PYTHON_VERSION" == "3.12" ]] ; then
+    export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;/c/hostedtoolcache/windows/Python/3.12.10/x64"
+    export Python_EXECUTABLE="/c/hostedtoolcache/windows/Python/3.12.10/x64/python3.exe"
+    export PYTHONPATH=$OpenImageIO_ROOT/lib/python${PYTHON_VERSION}/site-packages
 fi
 pip install numpy
 
diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake
@@ -110,6 +110,7 @@ macro (oiio_add_tests)
                              "OIIO_TESTSUITE_ROOT=${_testsuite}"
                              "OIIO_TESTSUITE_SRC=${_testsrcdir}"
                              "OIIO_TESTSUITE_CUR=${_testdir}"
+                             "Python_EXECUTABLE=${Python3_EXECUTABLE}"
                              ${_ats_ENVIRONMENT})
             if (NOT ${_ats_testdir} STREQUAL "")
                 set_property(TEST ${_testname} APPEND PROPERTY ENVIRONMENT
diff --git a/src/libOpenImageIO/imagebuf.cpp b/src/libOpenImageIO/imagebuf.cpp
@@ -150,10 +150,11 @@ class ImageBufImpl {
                      stride_t ystride = AutoStride,
                      stride_t zstride = AutoStride)
     {
-        m_bufspan = image_span(reinterpret_cast<std::byte*>(data),
-                               m_spec.nchannels, m_spec.width, m_spec.height,
-                               m_spec.depth, m_spec.format.size(), xstride,
-                               ystride, zstride);
+        auto formatsize = m_spec.format.size();
+        m_bufspan       = image_span(reinterpret_cast<std::byte*>(data),
+                                     m_spec.nchannels, m_spec.width, m_spec.height,
+                                     m_spec.depth, formatsize, xstride, ystride,
+                                     zstride, formatsize);
     }
 
     bool init_spec(string_view filename, int subimage, int miplevel,
diff --git a/src/libOpenImageIO/imageinput.cpp b/src/libOpenImageIO/imageinput.cpp
@@ -211,6 +211,40 @@ ImageInput::spec_dimensions(int subimage, int miplevel)
 
 
 
+// Utility: Make sure the provided data span is the right size for the
+// image described by spec and datatype. If they don't match, issue an
+// error and return false.
+static bool
+check_span_size(ImageInput* in, string_view caller, const ImageSpec& spec,
+                TypeDesc datatype, imagesize_t npixels, int chbegin, int chend,
+                const image_span<std::byte>& data)
+{
+    // One of two things must be correct: Either format is Unknown and the
+    // total byte size needs to match the "native" size, or the format is
+    // concrete and the number of value must match (it's ok if the size
+    // doesn't match, since a data type conversion will occur).
+    if (datatype.is_unknown()) {  // Unknown assumes native chan types
+        size_t sz = npixels * spec.pixel_bytes(chbegin, chend, true);
+        if (sz != data.size_bytes()) {
+            in->errorfmt(
+                "{}: image_span size is incorrect ({} bytes vs {} needed)",
+                caller, data.size_bytes(), sz);
+            return false;
+        }
+    } else {  // single concrete type
+        size_t nvals = npixels * size_t(chend - chbegin);
+        if (nvals != data.nvalues()) {
+            in->errorfmt(
+                "{}: image_span size is incorrect ({} values vs {} needed)",
+                caller, data.nvalues(), nvals);
+            return false;
+        }
+    }
+    return true;
+}
+
+
+
 bool
 ImageInput::read_scanline(int y, int z, TypeDesc format, void* data,
                           stride_t xstride)
@@ -300,16 +334,10 @@ ImageInput::read_scanlines(int subimage, int miplevel, int ybegin, int yend,
                  chend);
         return false;
     }
-    size_t isize = (format == TypeUnknown
-                        ? spec.pixel_bytes(chbegin, chend, true /*native*/)
-                        : format.size() * (chend - chbegin))
-                   * size_t(spec.width);
-    if (isize != data.size_bytes()) {
-        errorfmt(
-            "read_scanlines: Buffer size is incorrect ({} bytes vs {} needed)",
-            isize, data.size_bytes());
+    if (!check_span_size(this, "read_scanlines", m_spec, format,
+                         m_spec.width * size_t(yend - ybegin), chbegin, chend,
+                         data))
         return false;
-    }
 
     // Default implementation (for now): call the old pointer+stride
     return read_scanlines(subimage, miplevel, ybegin, yend, 0, chbegin, chend,
@@ -656,16 +684,11 @@ ImageInput::read_tiles(int subimage, int miplevel, int xbegin, int xend,
         errorfmt("read_tiles: invalid channel range [{},{})", chbegin, chend);
         return false;
     }
-    size_t isize = (format == TypeUnknown
-                        ? spec.pixel_bytes(chbegin, chend, true /*native*/)
-                        : format.size() * (chend - chbegin))
-                   * size_t(xend - xbegin) * size_t(yend - ybegin)
-                   * size_t(zend - zbegin);
-    if (isize != data.size_bytes()) {
-        errorfmt("read_tiles: Buffer size is incorrect ({} bytes vs {} needed)",
-                 isize, data.size_bytes());
+    if (!check_span_size(this, "read_tiles", m_spec, format,
+                         size_t(xend - xbegin) * size_t(yend - ybegin)
+                             * size_t(zend - zbegin),
+                         chbegin, chend, data))
         return false;
-    }
 
     // Default implementation (for now): call the old pointer+stride
     return read_tiles(subimage, miplevel, ybegin, yend, xbegin, xend, zbegin,
@@ -1164,24 +1187,6 @@ bool
 ImageInput::read_image(int subimage, int miplevel, int chbegin, int chend,
                        TypeDesc format, const image_span<std::byte>& data)
 {
-#if 0
-    ImageSpec spec = spec_dimensions(subimage, miplevel);
-    if (chend < 0 || chend > spec.nchannels)
-        chend = spec.nchannels;
-    size_t isize = (format == TypeUnknown
-                        ? spec.pixel_bytes(chbegin, chend, true /*native*/)
-                        : format.size() * (chend - chbegin))
-                   * spec.image_pixels();
-    if (isize != data.size_bytes()) {
-        errorfmt("read_image: Buffer size is incorrect ({} bytes vs {} needed)",
-                 sz, data.size_bytes());
-        return false;
-    }
-
-    // Default implementation (for now): call the old pointer+stride
-    return read_image(subimage, miplevel, chbegin, chend, format, data.data(),
-                      data.xstride(), data.ystride(), data.zstride());
-#else
     OIIO::pvt::LoggedTimer logtime("II::read_image");
     ImageSpec spec;
     int rps = 0;
@@ -1210,16 +1215,9 @@ ImageInput::read_image(int subimage, int miplevel, int chbegin, int chend,
         errorfmt("read_image: invalid channel range [{},{})", chbegin, chend);
         return false;
     }
-    int nchans         = chend - chbegin;
-    bool native        = (format == TypeUnknown);
-    size_t pixel_bytes = native ? spec.pixel_bytes(chbegin, chend, native)
-                                : (format.size() * nchans);
-    size_t isize       = pixel_bytes * spec.image_pixels();
-    if (isize != data.size_bytes()) {
-        errorfmt("read_image: Buffer size is incorrect ({} bytes vs {} needed)",
-                 isize, data.size_bytes());
+    if (!check_span_size(this, "read_image", m_spec, format,
+                         spec.image_pixels(), chbegin, chend, data))
         return false;
-    }
 
     bool ok = true;
     if (spec.tile_width) {  // Tiled image -- rely on read_tiles
@@ -1259,7 +1257,6 @@ ImageInput::read_image(int subimage, int miplevel, int chbegin, int chend,
         }
     }
     return ok;
-#endif
 }
 
 
diff --git a/src/libOpenImageIO/imageoutput.cpp b/src/libOpenImageIO/imageoutput.cpp
@@ -102,6 +102,40 @@ ImageOutput::~ImageOutput()
 
 
 
+// Utility: Make sure the provided data span is the right size for the
+// image described by spec and datatype. If they don't match, issue an
+// error and return false.
+static bool
+check_span_size(ImageOutput* out, string_view caller, const ImageSpec& spec,
+                TypeDesc datatype, imagesize_t npixels,
+                const image_span<const std::byte>& data)
+{
+    // One of two things must be correct: Either format is Unknown and the
+    // total byte size needs to match the "native" size, or the format is
+    // concrete and the number of value must match (it's ok if the size
+    // doesn't match, since a data type conversion will occur).
+    if (datatype.is_unknown()) {  // Unknown assumes native chan types
+        size_t sz = npixels * spec.pixel_bytes(true);
+        if (sz != data.size_bytes()) {
+            out->errorfmt(
+                "{}: image_span size is incorrect ({} bytes vs {} needed)",
+                caller, data.size_bytes(), sz);
+            return false;
+        }
+    } else {  // single concrete type
+        size_t nvals = npixels * size_t(spec.nchannels);
+        if (nvals != data.nvalues()) {
+            out->errorfmt(
+                "{}: image_span size is incorrect ({} values vs {} needed)",
+                caller, data.nvalues(), nvals);
+            return false;
+        }
+    }
+    return true;
+}
+
+
+
 bool
 ImageOutput::write_scanline(int /*y*/, int /*z*/, TypeDesc /*format*/,
                             const void* /*data*/, stride_t /*xstride*/)
@@ -120,13 +154,9 @@ ImageOutput::write_scanline(int y, TypeDesc format,
         errorfmt("write_scanlines: Invalid scanline index {}", y);
         return false;
     }
-    size_t sz = m_spec.scanline_bytes(format);
-    if (sz != data.size_bytes()) {
-        errorfmt(
-            "write_scanline: Buffer size is incorrect ({} bytes vs {} needed)",
-            sz, data.size_bytes());
+    if (!check_span_size(this, "write_scanline", m_spec, format, m_spec.width,
+                         data))
         return false;
-    }
 
     // Default implementation (for now): call the old pointer+stride
     return write_scanline(y, 0, format, data.data(), data.xstride());
@@ -164,13 +194,9 @@ ImageOutput::write_scanlines(int ybegin, int yend, TypeDesc format,
         errorfmt("write_scanlines: Invalid scanline range {}-{}", ybegin, yend);
         return false;
     }
-    size_t sz = m_spec.scanline_bytes(format) * size_t(yend - ybegin);
-    if (sz != data.size_bytes()) {
-        errorfmt(
-            "write_scanlines: Buffer size is incorrect ({} bytes vs {} needed)",
-            sz, data.size_bytes());
+    if (!check_span_size(this, "write_scanlines", m_spec, format,
+                         m_spec.width * size_t(yend - ybegin), data))
         return false;
-    }
 
     // Default implementation (for now): call the old pointer+stride
     return write_scanlines(ybegin, yend, 0, format, data.data(), data.xstride(),
@@ -194,15 +220,9 @@ bool
 ImageOutput::write_tile(int x, int y, int z, TypeDesc format,
                         const image_span<const std::byte>& data)
 {
-    size_t sz = format == TypeUnknown
-                    ? m_spec.pixel_bytes(true /*native*/)
-                    : m_spec.tile_pixels() * size_t(m_spec.nchannels)
-                          * format.size();
-    if (sz != data.size_bytes()) {
-        errorfmt("write_tile: Buffer size is incorrect ({} bytes vs {} needed)",
-                 sz, data.size_bytes());
+    if (!check_span_size(this, "write_tile", m_spec, format,
+                         m_spec.tile_pixels(), data))
         return false;
-    }
 
     // Default implementation (for now): call the old pointer+stride
     return write_tile(x, y, z, format, data.data(), data.xstride(),
@@ -691,12 +711,9 @@ bool
 ImageOutput::write_image(TypeDesc format,
                          const image_span<const std::byte>& data)
 {
-    size_t sz = m_spec.image_bytes(/*native=*/format == TypeUnknown);
-    if (sz != data.size_bytes()) {
-        errorfmt("write_image: Buffer size is incorrect ({} bytes vs {} needed)",
-                 sz, data.size_bytes());
+    if (!check_span_size(this, "write_image", m_spec, format,
+                         m_spec.image_pixels(), data))
         return false;
-    }
 
     // Default implementation (for now): call the old pointer+stride
     return write_image(format, data.data(), data.xstride(), data.ystride(),
diff --git a/testsuite/runtest.py b/testsuite/runtest.py
@@ -162,9 +162,7 @@ def newsymlink(src: str, dst: str):
 if os.getenv("Python_EXECUTABLE") :
     pythonbin = os.getenv("Python_EXECUTABLE")
 else :
-    pythonbin = 'python'
-    if os.getenv("PYTHON_VERSION") :
-        pythonbin += os.getenv("PYTHON_VERSION")
+    pythonbin = sys.executable
 #print ("pythonbin = ", pythonbin)
 
 
