Merge remote-tracking branch 'upstream/main' into _imgui

Signed-off-by: Vlad (Kuzmin) Erium <libalias@gmail.com>

Author: ssh4net

CONTRIBUTING.md

@@ -1,3 +1,7 @@
+<!-- SPDX-License-Identifier: CC-BY-4.0 -->
+<!-- Copyright Contributors to the OpenImageIO Project. -->
+
+
 Contributing to OpenImageIO
 ===========================
 
@@ -70,6 +74,26 @@ If confidentiality precludes a public question or issue for any reason, you
 may contact us privately at [security@openimageio.org](security@openimageio.org).
 
 
+Policy on AI Tools
+------------------
+
+Please read our [Policy on AI Coding Assistants](docs/dev/AI_Policy.md)
+before contributing or particpating in the project in any way mediated by "AI"
+assistants.
+
+High-level summary:
+- Human must always be in the loop, and is the responsible party for
+  the contents of a PR (including fully understanding and being able
+  to explain, defend, and modify it in response to review comments).
+- Interact with the project and community yourself, not by agent.
+- Disclose what tools you used and how. At a minimum, we require an
+  "Assisted-by: TOOL/MODEL" line in the commit comments and PR description.
+- Don't waste maintainer's time with low quality PRs.
+
+Please do read the whole [Policy on AI Coding Assistants](docs/dev/AI_Policy.md)
+for all the details.
+
+
 Contributor License Agreement (CLA) and Intellectual Property
 -------------------------------------------------------------
 
@@ -230,33 +254,33 @@ repository. The protocol is like this:
 your own repository on GitHub, and then clone it to get a repository on your
 local machine.
 
-1. Edit, compile, and test your changes. Run clang-format (see the
+2. Edit, compile, and test your changes. Run clang-format (see the
 instructions on coding style below).
 
-1. Push your changes to your fork (each unrelated pull request to a separate
+3. Push your changes to your fork (each unrelated pull request to a separate
 "topic branch", please).
 
-1. Make a "pull request" on GitHub for your patch.
+4. Make a "pull request" on GitHub for your patch.
 
-2. If your patch will induce a major compatibility break, or has a design
+5. If your patch will induce a major compatibility break, or has a design
 component that deserves extended discussion or debate among the wider OIIO
 community, then it may be prudent to email oiio-dev pointing everybody to
 the pull request URL and discussing any issues you think are important.
 
-1. All pull requests automatically launch CI jobs on GitHub Actions to
+6. All pull requests automatically launch CI jobs on GitHub Actions to
 ensure that the build completes and that the tests suite runs correctly, for
 a variety of platform, compiler, library, and flag combinations. The status
 of the CI tests for your PR will be displayed on the GitHub PR page. We will
 not accept PRs that don't build cleanly or pass the existing testsuite.
 
-1. The reviewer will look over the code and critique on the "comments" area.
+7. The reviewer will look over the code and critique on the "comments" area.
 Reviewers may ask for changes, explain problems they found, congratulate the
 author on a clever solution, etc. But until somebody says "LGTM" (looks good
 to me), the code should not be committed. Sometimes this takes a few rounds
 of give and take. Please don't take it hard if your first try is not
 accepted. It happens to all of us.
 
-1. After approval, one of the senior developers (with commit approval to the
+8. After approval, one of the senior developers (with commit approval to the
 official main repository) will merge your fixes into the main branch.
 
 Please see the [Code Review](docs/dev/CodeReview.md) document for more

CREDITS.md

@@ -4,6 +4,7 @@ by first name.
 If you know of somebody that I missed or have corrections, please email:
 lg@openimageio.org
 
+* Aamir Raza
 * Aaron Colwell
 * Adam Mains
 * Akihiro Yamasaki

README.md

@@ -144,6 +144,8 @@ pull request (PR) mechanism.
   description of the major classes and their relationships.
 * [CONTRIBUTING](CONTRIBUTING.md) has detailed instructions about the
   development process.
+* [AI Policy](docs/dev/AI_Policy.md) decribes our policies on AI coding
+  assistance tools.
 * [ROADMAP](docs/ROADMAP.md) is a high-level overview of the current
   development priorities for the next annual release, expected in September,
   2024.

src/build-scripts/ci-build.bash

@@ -13,6 +13,13 @@ export OIIO_SRC_DIR=${OIIO_SRC_DIR:=$PWD}
 export OIIO_BUILD_DIR=${OIIO_BUILD_DIR:=${OIIO_SRC_DIR}/build}
 export OIIO_INSTALL_DIR=${OIIO_INSTALL_DIR:=${OIIO_SRC_DIR}/dist}
 export OIIO_CMAKE_BUILD_TYPE=${OIIO_CMAKE_BUILD_TYPE:=${CMAKE_BUILD_TYPE:=Release}}
+# Allow OIIO_specific overrides for CC, CXX
+if [[ "$OIIO_CC" != "" ]] ; then
+    CC=$OIIO_CC
+fi
+if [[ "$OIIO_CXX" != "" ]] ; then
+    CXX=$OIIO_CXX
+fi
 
 if [[ "$USE_SIMD" != "" ]] ; then
     OIIO_CMAKE_FLAGS="$OIIO_CMAKE_FLAGS -DUSE_SIMD=$USE_SIMD"

src/build-scripts/gh-installdeps.bash

@@ -117,8 +117,9 @@ else
     if [[ "${USE_PYTHON}" != "0" ]] ; then
         time sudo apt-get -q install -y python3-numpy
     fi
+    : ${PIP_SUFFIX:=}
     if [[ "${PIP_INSTALLS}" != "" ]] ; then
-        time pip3 install ${PIP_INSTALLS}
+        time pip3${PIP_SUFFIX} install ${PIP_INSTALLS}
     fi
 
     if [[ "$USE_LIBHEIF" != "0" ]] ; then

src/doc/oiiotool.rst

@@ -269,7 +269,7 @@ Control flow
 Scriptability is provided by the use of control flow statements.
 The usual programming constructs are supported:
 
-* Conditionals : `--if` *condition* `--then` *commands...* `--else` *commands...* `--endif`
+* Conditionals : `--if` *condition* *commands...* `--else` *commands...* `--endif`
 
 * General looping: `--while` *condition* *commands...* `--endwhile`
 

src/libOpenImageIO/exif.cpp

@@ -178,6 +178,12 @@ tiff_data_size(const TIFFDirEntry& dir)
 
 
 
+// N.B. We have to turn undefined behavior sanitizer off for this function
+// because ubsan will complain about tifftype being an invalid enum value in
+// cases where the value really is corrupted and invalid -- but the switch
+// statement here is nonetheless safe because it just returns TypeUnknown in
+// such cases.
+OIIO_NO_SANITIZE_UNDEFINED
 TypeDesc
 tiff_datatype_to_typedesc(TIFFDataType tifftype, size_t tiffcount)
 {
@@ -208,6 +214,7 @@ tiff_datatype_to_typedesc(TIFFDataType tifftype, size_t tiffcount)
     case TIFF_SLONG8: return TypeDesc(TypeDesc::INT64, tiffcount);
     case TIFF_IFD8: return TypeUnknown;
 #endif
+    default: break;
     }
     return TypeUnknown;
 }

src/libOpenImageIO/imagebufalgo.cpp

@@ -1614,10 +1614,20 @@ ImageBufAlgo::fillholes_pushpull(ImageBuf& dst, const ImageBuf& src, ROI roi,
 
     // First, make a writable copy of the original image (converting
     // to float as a convenience) as the top level of the pyramid.
+    // Shift everything to origin (0,0) with full=data so that resize
+    // correctly maps the entire data extent between pyramid levels,
+    // even when the data window is offset from the display window.
     ImageSpec topspec = src.spec();
     topspec.set_format(TypeDesc::FLOAT);
-    ImageBuf* top = new ImageBuf(topspec);
-    paste(*top, topspec.x, topspec.y, topspec.z, 0, src);
+    topspec.full_x      = 0;
+    topspec.full_y      = 0;
+    topspec.full_width  = topspec.width;
+    topspec.full_height = topspec.height;
+    topspec.x           = 0;
+    topspec.y           = 0;
+    topspec.z           = 0;
+    ImageBuf* top       = new ImageBuf(topspec);
+    paste(*top, -src.spec().x, -src.spec().y, -src.spec().z, 0, src);
     pyramid.emplace_back(top);
 
     // Construct the rest of the pyramid by successive x/2 resizing and

src/libutil/strutil_test.cpp

@@ -1328,6 +1328,14 @@ test_string_view()
     Strutil::print("addr cstr={:p}, s={:p}, ustring={:p}, sr={:p}, c_str(sr)={:p}\n",
                      (void*)cstr, (void*)s.c_str(), (void*)ustring(cstr).c_str(), (void*)sr.data(),
                      (void*)OIIO::c_str(sr));
+
+    // Test some edge cases for fmt formatting
+    string_view empty(""), uninit;
+    Strutil::print("Test print empty string_view: '{}'\n", empty);
+    Strutil::print("Test print default initialized string_view: '{}'\n", uninit);
+    OIIO_CHECK_EQUAL(empty, uninit);
+    OIIO_CHECK_EQUAL(Strutil::format("{}", empty),
+                     Strutil::format("{}", uninit));
 }
 
 

src/libutil/ustring.cpp

@@ -522,7 +522,7 @@ ustring::make_unique(string_view strref)
     size_t bin = rm.lock_bin(hash);
 
     hash_t orighash     = hash;
-    size_t binmask      = orighash & (~rm.nobin_mask());
+    size_t binbits      = orighash & (~rm.nobin_mask());
     size_t num_rehashes = 0;
 
     while (1) {
@@ -546,16 +546,31 @@ ustring::make_unique(string_view strref)
             break;
         }
         // Rehash, but keep the bin bits identical so we always rehash into
-        // the same (locked) bin.
-        hash = (hash & binmask)
-               | (farmhash::Fingerprint(hash) & rm.nobin_mask());
+        // the same (locked) bin. But watch out for rehashing that returns the
+        // identical non-bin part as before -- that will enter an infinite
+        // loop if we're not careful!
+        hash_t old_nonbin_bits = hash & rm.nobin_mask();
+        hash_t new_nonbin_bits = farmhash::Fingerprint(hash) & rm.nobin_mask();
+        if (OIIO_UNLIKELY(old_nonbin_bits == new_nonbin_bits)) {
+            new_nonbin_bits = (new_nonbin_bits + 7) & rm.nobin_mask();
+#    ifndef NDEBUG
+            std::string s = Strutil::escape_chars(strref);
+            print(stderr, "IDEMPOTENT RE-HASH! |{}|\n", s);
+            for (auto c : s)
+                print(stderr, c > 0 ? "{:c}" : "\\{:03o}",
+                      static_cast<unsigned char>(c));
+            print(stderr, "\n");
+#    endif
+        }
+        hash = binbits | new_nonbin_bits;
         ++num_rehashes;
         // Strutil::print("COLLISION \"{}\" {:08x} vs \"{}\"\n",
         //                strref, orighash, rev->second);
         {
             std::lock_guard<std::mutex> lock(collision_mutex);
             all_hash_collisions.emplace_back(rev->second, rev->first);
         }
+        OIIO_ASSERT(num_rehashes < 100000);  // Something is very wrong
     }
     rm.unlock_bin(bin);