Merge remote-tracking branch 'upstream/main'

Author: ssh4net

CMakeLists.txt

@@ -142,6 +142,12 @@ if (TEX_BATCH_SIZE)
     add_compile_definitions (OIIO_TEXTURE_SIMD_BATCH_WIDTH=${TEX_BATCH_SIZE})
 endif ()
 
+# If we're building this just for CI, define a symbol so the code can
+# tell (and reduce complexity of some tests)
+set_option (OIIO_CI "Set if this build is for our GHA CI" OFF)
+if (OIIO_CI)
+    add_compile_definitions (OIIO_CI=1)
+endif ()
 
 # Namespace settings
 #

Makefile

@@ -159,7 +159,7 @@ MY_CMAKE_FLAGS += -DTEX_BATCH_SIZE:STRING="${TEX_BATCH_SIZE}"
 endif
 
 ifneq (${TEST},)
-TEST_FLAGS += -R ${TEST}
+TEST_FLAGS += -R '${TEST}'
 endif
 
 ifneq (${USE_CCACHE},)

src/bmp.imageio/bmpinput.cpp

@@ -395,13 +395,28 @@ BmpInput::read_native_scanline(int subimage, int miplevel, int y, int /*z*/,
     if ((m_dib_header.compression == RLE4_COMPRESSION
          || m_dib_header.compression == RLE8_COMPRESSION)
         && m_colortable.size()) {
-        for (int x = 0; x < m_spec.width; ++x) {
-            int p = m_uncompressed[int64_t(m_spec.height - 1 - y) * m_spec.width
-                                   + x];
-            auto& c              = colortable(p);
-            mscanline[3 * x]     = c.r;
-            mscanline[3 * x + 1] = c.g;
-            mscanline[3 * x + 2] = c.b;
+        if (m_spec.nchannels == 1) {
+            OIIO_CONTRACT_ASSERT(m_allgray);
+            for (int x = 0; x < m_spec.width; ++x) {
+                int p
+                    = m_uncompressed[int64_t(m_spec.height - 1 - y) * m_spec.width
+                                     + x];
+                auto& c      = colortable(p);
+                mscanline[x] = c.r;
+                // For the "all gray" case, rgb are equal and we're filling in
+                // a 1-channel data buffer.
+            }
+        } else {
+            OIIO_CONTRACT_ASSERT(m_spec.nchannels == 3);
+            for (int x = 0; x < m_spec.width; ++x) {
+                int p
+                    = m_uncompressed[int64_t(m_spec.height - 1 - y) * m_spec.width
+                                     + x];
+                auto& c              = colortable(p);
+                mscanline[3 * x]     = c.r;
+                mscanline[3 * x + 1] = c.g;
+                mscanline[3 * x + 2] = c.b;
+            }
         }
         return true;
     }

src/build-scripts/ci-startup.bash

@@ -36,7 +36,7 @@ export PYTHONPATH=$OpenImageIO_ROOT/lib/python${PYTHON_VERSION}/site-packages:$P
 export COMPILER=${COMPILER:=gcc}
 export CC=${CC:=gcc}
 export CXX=${CXX:=g++}
-export OpenImageIO_CI=true
+export OpenImageIO_CI=1
 export USE_NINJA=${USE_NINJA:=1}
 export CMAKE_GENERATOR=${CMAKE_GENERATOR:=Ninja}
 export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:=Release}

src/include/OpenImageIO/color.h

@@ -121,25 +121,27 @@ class OIIO_API ColorConfig {
     int getColorSpaceIndex(string_view name) const;
 
     /// Get the name of the color space representing the named role,
-    /// or NULL if none could be identified.
+    /// or nullptr if none could be identified.
     const char* getColorSpaceNameByRole(string_view role) const;
 
     /// Get the data type that OCIO thinks this color space is. The name
-    /// may be either a color space name or a role.
+    /// may be either a color space name or a role. For an unknown space or
+    /// any error, return TypeUnknown.
     OIIO::TypeDesc getColorSpaceDataType(string_view name, int* bits) const;
 
     /// Retrieve the full list of known color space names, as a vector
     /// of strings.
     std::vector<std::string> getColorSpaceNames() const;
 
     /// Get the name of the color space family of the named color space,
-    /// or NULL if none could be identified.
+    /// or nullptr if none could be identified.
     const char* getColorSpaceFamilyByName(string_view name) const;
 
     // Get the number of Roles defined in this configuration
     int getNumRoles() const;
 
-    /// Query the name of the specified Role.
+    /// Query the name of the specified Role, or return nullptr if there is no
+    /// role with that index.
     const char* getRoleByIndex(int index) const;
 
     /// Retrieve the full list of known Roles, as a vector of strings.
@@ -148,7 +150,8 @@ class OIIO_API ColorConfig {
     /// Get the number of Looks defined in this configuration
     int getNumLooks() const;
 
-    /// Query the name of the specified Look.
+    /// Query the name of the specified Look, or return nullptr if there is no
+    /// look with that index.
     const char* getLookNameByIndex(int index) const;
 
     /// Retrieve the full list of known look names, as a vector of strings.
@@ -157,7 +160,8 @@ class OIIO_API ColorConfig {
     /// Get the number of NamedTransforms defined in this configuration
     int getNumNamedTransforms() const;
 
-    /// Query the name of the specified NamedTransform.
+    /// Query the name of the specified NamedTransform, or nullptr if there is
+    /// no NamedTransform with that index.
     const char* getNamedTransformNameByIndex(int index) const;
 
     /// Retrieve the full list of known NamedTransforms, as a vector of strings
@@ -221,7 +225,8 @@ class OIIO_API ColorConfig {
     /// Get the number of displays defined in this configuration
     int getNumDisplays() const;
 
-    /// Query the name of the specified display.
+    /// Query the name of the specified display, or nullptr if there is no
+    /// display with that index.
     const char* getDisplayNameByIndex(int index) const;
 
     /// Retrieve the full list of known display names, as a vector of
@@ -236,7 +241,9 @@ class OIIO_API ColorConfig {
     /// display will be used.
     int getNumViews(string_view display = "") const;
 
-    /// Query the name of the specified view for the specified display
+    /// Query the name of the specified view for the specified display, or
+    /// nullptr if there is no view with that index or if the display is not
+    /// found.
     const char* getViewNameByIndex(string_view display, int index) const;
 
     /// Retrieve the full list of known view names for the display, as a
@@ -247,12 +254,14 @@ class OIIO_API ColorConfig {
     /// Query the name of the default view for the specified display. If the
     /// display is empty or not specified, the default display will be used.
     /// This version does not consider the input color space.
+    /// Returns nullptr for failure.
     const char* getDefaultViewName(string_view display = "") const;
 
     /// Query the name of the default view for the specified display, given
     /// the input color space. If `display` is "default" or an empty string,
     /// the default display will be used. The input color space is used to
     /// determine the most appropriate default view for the given display.
+    /// Returns nullptr for failure.
     const char* getDefaultViewName(string_view display,
                                    string_view inputColorSpace) const;
 

src/include/OpenImageIO/fmath.h

@@ -200,6 +200,7 @@ floor2(int x) noexcept
 template <typename V, typename M>
 inline OIIO_HOSTDEVICE V round_to_multiple (V value, M multiple)
 {
+    OIIO_DASSERT(multiple > M(0));
     if (value >= 0)
         value += V(multiple) - 1;
     return value - (value % V(multiple));

src/include/OpenImageIO/imageio.h

@@ -721,7 +721,7 @@ class OIIO_API ImageSpec {
     /// Retrieve the named metadata attribute and return its value as an
     /// `int`. Any integer type will convert to `int` by truncation or
     /// expansion, string data will parsed into an `int` if its contents
-    /// consist of of the text representation of one integer. Floating point
+    /// consist of the text representation of one integer. Floating point
     /// data will not succeed in converting to an `int`. If no such metadata
     /// exists, or are of a type that cannot be converted, the `defaultval`
     /// will be returned.
@@ -730,7 +730,7 @@ class OIIO_API ImageSpec {
     /// Retrieve the named metadata attribute and return its value as a
     /// `float`. Any integer or floating point type will convert to `float`
     /// in the obvious way (like a C cast), and so will string metadata if
-    /// its contents consist of of the text representation of one floating
+    /// its contents consist of the text representation of one floating
     /// point value. If no such metadata exists, or are of a type that cannot
     /// be converted, the `defaultval` will be returned.
     float get_float_attribute (string_view name, float defaultval=0) const;

src/jpeg2000.imageio/jpeg2000input.cpp

@@ -392,7 +392,9 @@ Jpeg2000Input::ojph_read_image()
     int ch              = m_spec.nchannels;
     ojph::param_siz siz = codestream.access_siz();
 
-    const int bufsize = w * h * ch * buffer_bpp;
+    const size_t bufsize
+        = clamped_mult64(clamped_mult64(uint64_t(w), uint64_t(h)),
+                         clamped_mult64(uint64_t(ch), uint64_t(buffer_bpp)));
     m_buf.resize(bufsize);
     codestream.create();
 
@@ -622,6 +624,14 @@ Jpeg2000Input::open(const std::string& name, ImageSpec& p_spec)
     m_spec.full_width  = m_image->x1;
     m_spec.full_height = m_image->y1;
 
+    // Validation of resolution
+    if (!check_open(m_spec,
+                    { 0, std::numeric_limits<int>::max(), 0,
+                      std::numeric_limits<int>::max(), 0, 1, 0, 16384 })) {
+        close();
+        return false;
+    }
+
     m_spec.attribute("oiio:BitsPerSample", maxPrecision);
     m_spec.set_colorspace("srgb_rec709_scene");
 

src/libOpenImageIO/CMakeLists.txt

@@ -263,11 +263,13 @@ if (OIIO_BUILD_TESTS AND BUILD_TESTING)
                           LINK_LIBRARIES OpenImageIO Imath::Imath
                           FOLDER "Unit Tests" NO_INSTALL)
     add_test (unit_image_span ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/image_span_test)
+    set_tests_properties (unit_image_span PROPERTIES COST 10)
 
     fancy_add_executable (NAME imagebuf_test SRC imagebuf_test.cpp
                           LINK_LIBRARIES OpenImageIO
                           FOLDER "Unit Tests" NO_INSTALL)
     add_test (unit_imagebuf ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/imagebuf_test)
+    set_tests_properties (unit_imagebuf PROPERTIES COST 30)
 
     fancy_add_executable (NAME imagecache_test SRC imagecache_test.cpp
                           LINK_LIBRARIES OpenImageIO
@@ -284,6 +286,7 @@ if (OIIO_BUILD_TESTS AND BUILD_TESTING)
                           FOLDER "Unit Tests" NO_INSTALL)
     target_compile_definitions (imagebufalgo_test PRIVATE OIIO_USE_HWY=${_oiio_use_hwy})
     add_test (unit_imagebufalgo ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/imagebufalgo_test)
+    set_tests_properties (unit_imagebufalgo PROPERTIES PROCESSORS 2 COST 60)
 
     fancy_add_executable (NAME imagespec_test SRC imagespec_test.cpp
                           LINK_LIBRARIES OpenImageIO
@@ -294,6 +297,7 @@ if (OIIO_BUILD_TESTS AND BUILD_TESTING)
                           LINK_LIBRARIES OpenImageIO
                           FOLDER "Unit Tests" NO_INSTALL)
     add_test (unit_imageinout ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/imageinout_test)
+    set_tests_properties (unit_imageinout PROPERTIES PROCESSORS 2 COST 30)
 
     if (NOT DEFINED ENV{OpenImageIO_CI})
         fancy_add_executable (NAME imagespeed_test SRC imagespeed_test.cpp