Merge branch 'AcademySoftwareFoundation:main' into tStop_typo

AcademySoftwareFoundation · May 13, 2024 · 0e3a1fb · 0e3a1fb
2 parents 471e5dd + 810e456
commit 0e3a1fb
Show file tree

Hide file tree

Showing 32 changed files with 510 additions and 209 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.0.2
+7.1.1
diff --git a/.github/workflows/bazel_build.yml b/.github/workflows/bazel_build.yml
@@ -50,7 +50,7 @@ jobs:
     - name: Build
       run: |
         bazelisk build //...
-        bazelisk test //...
+        bazelisk test --test_output=errors //...
 
   build_and_test_windows:
     name: Windows Server 2022 build <Visual Studio 2022>
@@ -68,7 +68,7 @@ jobs:
     - name: Build
       run: |
         bazelisk build //...
-        bazelisk test //...
+        bazelisk test --test_output=errors //...
 
   build_and_test_macos:
     name: macOS 13 Bazel build <Apple Clang14>
@@ -86,7 +86,7 @@ jobs:
     - name: Build
       run: |
         bazelisk build //...
-        bazelisk test //...
+        bazelisk test --test_output=errors //...
 
   build_and_test_macos_M1:
     name: macOS 14 Bazel build <Apple Clang14>
@@ -104,4 +104,4 @@ jobs:
     - name: Build
       run: |
         bazelisk build //...
-        bazelisk test //...
+        bazelisk test --test_output=errors //...
diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
@@ -71,9 +71,8 @@ jobs:
       matrix:
         build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
         include:
-
           # -------------------------------------------------------------------
-          # VFX CY2023 - GCC
+          # VFX CY2024 - GCC
           # -------------------------------------------------------------------
           # Shared, Release
           - build: 1
@@ -85,7 +84,7 @@ jobs:
             compiler-desc: gcc11.2.1
             label: 
             threads-enabled: 'ON'
-            vfx-cy: 2023
+            vfx-cy: 2024
             exclude-tests:
 
           # Shared, Release, Threads OFF
@@ -98,7 +97,7 @@ jobs:
             compiler-desc: gcc11.2.1
             label: 
             threads-enabled: 'OFF'
-            vfx-cy: 2023
+            vfx-cy: 2024
             exclude-tests:
 
           # Shared, Debug
@@ -111,7 +110,7 @@ jobs:
             compiler-desc: gcc11.2.1
             label: 
             threads-enabled: 'ON'
-            vfx-cy: 2023
+            vfx-cy: 2024
             exclude-tests:
 
           # Static, Release
@@ -124,7 +123,7 @@ jobs:
             compiler-desc: gcc11.2.1
             label: 
             threads-enabled: 'ON'
-            vfx-cy: 2023
+            vfx-cy: 2024
             exclude-tests:
 
           # Shared, Release, C++14
@@ -137,11 +136,11 @@ jobs:
             compiler-desc: gcc11.2.1
             label: 
             threads-enabled: 'ON'
-            vfx-cy: 2023
+            vfx-cy: 2024
             exclude-tests:
 
           # -------------------------------------------------------------------
-          # VFX CY2023 - Clang 15.0
+          # VFX CY2024 - Clang 15.0
           # -------------------------------------------------------------------
           # Release
           - build: 6
@@ -153,11 +152,11 @@ jobs:
             compiler-desc: clang15.0
             label: 
             threads-enabled: 'ON'
-            vfx-cy: 2023
+            vfx-cy: 2024
             exclude-tests:
 
           # -------------------------------------------------------------------
-          # VFX CY2023 - Clang 14.0
+          # VFX CY2024 - Clang 14.0
           # -------------------------------------------------------------------
           # Release
           - build: 7
@@ -169,11 +168,11 @@ jobs:
             compiler-desc: clang14.0
             label: 
             threads-enabled: 'ON'
-            vfx-cy: 2023
+            vfx-cy: 2024
             exclude-tests:
 
           # -------------------------------------------------------------------
-          # VFX CY2022 - GCC, Release
+          # VFX CY2023 - GCC
           # -------------------------------------------------------------------
           # Shared, Release
           - build: 8
@@ -182,14 +181,14 @@ jobs:
             cxx-standard: 17
             cxx-compiler: g++
             cc-compiler: gcc
-            compiler-desc: gcc9.3.1
+            compiler-desc: gcc11.2.1
             label: 
             threads-enabled: 'ON'
-            vfx-cy: 2022
+            vfx-cy: 2023
             exclude-tests:
 
           # -------------------------------------------------------------------
-          # VFX CY2021 - GCC, Release
+          # VFX CY2022 - GCC, Release
           # -------------------------------------------------------------------
           # Shared, Release
           - build: 9
@@ -201,23 +200,23 @@ jobs:
             compiler-desc: gcc9.3.1
             label: 
             threads-enabled: 'ON'
-            vfx-cy: 2021
+            vfx-cy: 2022
             exclude-tests:
 
           # -------------------------------------------------------------------
-          # VFX CY2020 - GCC, Release
+          # VFX CY2021 - GCC, Release
           # -------------------------------------------------------------------
           # Shared, Release
           - build: 10
             build-type: Release
             build-shared: 'ON'
-            cxx-standard: 14
+            cxx-standard: 17
             cxx-compiler: g++
             cc-compiler: gcc
-            compiler-desc: gcc6.3.1
+            compiler-desc: gcc9.3.1
             label: 
             threads-enabled: 'ON'
-            vfx-cy: 2020
+            vfx-cy: 2021
             exclude-tests:
 
     env:
@@ -294,10 +293,10 @@ jobs:
     runs-on: macos-${{ matrix.osver }}
     strategy:
       matrix:
-        build: [1, 2, 3, 4, 5]
+        build: [1, 2, 3, 4, 5, 6]
         include:
           # -------------------------------------------------------------------
-          # VFX CY2023 - C++17 - MacOS 11.0 
+          # MacOS 14
           # -------------------------------------------------------------------
           # Shared, Release
           - build: 1
@@ -306,9 +305,9 @@ jobs:
             threads-enabled: 'ON'
             compiler-desc: AppleClang11.0
             cxx-standard: 17
-            osver: 11.0
+            osver: 14
             exclude-tests:
-            vfx-cy: 23
+            vfx-cy: 24
 
           # Shared, Release, Threads OFF
           - build: 2
@@ -317,9 +316,9 @@ jobs:
             threads-enabled: 'OFF'
             compiler-desc: AppleClang11.0
             cxx-standard: 17
-            osver: 11.0
+            osver: 14
             exclude-tests:
-            vfx-cy: 23
+            vfx-cy: 24
 
           # Static, Release
           - build: 3
@@ -328,9 +327,9 @@ jobs:
             threads-enabled: 'ON'
             compiler-desc: AppleClang11.0
             cxx-standard: 17
-            osver: 11.0
+            osver: 14
             exclude-tests:
-            vfx-cy: 23
+            vfx-cy: 24
 
           # Shared, Debug
           - build: 4
@@ -339,12 +338,12 @@ jobs:
             threads-enabled: 'ON'
             compiler-desc: AppleClang11.0
             cxx-standard: 17
-            osver: 11.0
+            osver: 14
             exclude-tests:
-            vfx-cy: 23
+            vfx-cy: 24
 
           # -------------------------------------------------------------------
-          # VFX CY2023 - C++17 - MacOS 12
+          # MacOS 13
           # -------------------------------------------------------------------
           # Shared, Release
           - build: 5
@@ -353,10 +352,25 @@ jobs:
             threads-enabled: 'ON'
             compiler-desc: AppleClang11.0
             cxx-standard: 17
-            osver: 12.0
+            osver: 13
             exclude-tests:
             vfx-cy: 23
 
+          # -------------------------------------------------------------------
+          # MacOS 12
+          # -------------------------------------------------------------------
+          # Shared, Release
+          - build: 6
+            build-type: Release
+            build-shared: 'ON'
+            threads-enabled: 'ON'
+            compiler-desc: AppleClang10.5
+            cxx-standard: 17
+            osver: 12
+            exclude-tests:
+            vfx-cy: 23
+
+
     steps:
       - name: Checkout
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
@@ -460,7 +474,7 @@ jobs:
             exclude-tests: ''
             osver: 2022
 
-         # -------------------------------------------------------------------
+          # -------------------------------------------------------------------
           # VFX CY2022 - C++17 - Windows 2019 runner - MSVC 2019 (16.11) 
           # -------------------------------------------------------------------
           # Shared, Release

diff --git a/.github/workflows/ossfuzz_workflow.yml b/.github/workflows/ossfuzz_workflow.yml
@@ -48,7 +48,7 @@ jobs:
         dry-run: false
         language: c++
     - name: Upload Crash
-      uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

diff --git a/.github/workflows/python-wheels-publish-test.yml b/.github/workflows/python-wheels-publish-test.yml
@@ -62,7 +62,7 @@ jobs:
           CIBW_ENVIRONMENT: OPENEXR_RELEASE_CANDIDATE_TAG="${{ github.ref_name }}"
 
       - name: Upload artifact
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: wheels-${{ matrix.os }}
           path: |
@@ -84,17 +84,17 @@ jobs:
 
     steps:
     - name: Download Linux artifacts
-      uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
+      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
       with:
         name: wheels-ubuntu-latest
         path: dist
     - name: Download macOS artifacts
-      uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
+      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
       with:
         name: wheels-macos-latest
         path: dist
     - name: Download Windows artifacts
-      uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
+      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
       with:
         name: wheels-windows-latest
         path: dist

diff --git a/.github/workflows/python-wheels-publish.yml b/.github/workflows/python-wheels-publish.yml
@@ -56,7 +56,7 @@ jobs:
           CIBW_TEST_SKIP: "*arm64"
 
       - name: Upload artifact
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: wheels-${{ matrix.os }}
           path: |
@@ -78,17 +78,17 @@ jobs:
 
     steps:
     - name: Download Linux artifacts
-      uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
+      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
       with:
         name: wheels-ubuntu-latest
         path: dist
     - name: Download macOS artifacts
-      uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
+      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
       with:
         name: wheels-macos-latest
         path: dist
     - name: Download Windows artifacts
-      uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
+      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
       with:
         name: wheels-windows-latest
         path: dist

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
@@ -65,7 +65,7 @@ jobs:
           CIBW_TEST_SKIP: "*-macosx*arm64"
 
       - name: Upload artifact
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: wheels-${{ matrix.os }}
           path: |

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -43,7 +43,7 @@ jobs:
 
       # Upload the results as artifacts (optional)
       - name: "Upload artifact"
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: SARIF file
           path: results.sarif

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -6,7 +6,7 @@ module(
     compatibility_level = 1,
 )
 
-bazel_dep(name = "bazel_skylib", version = "1.5.0")
+bazel_dep(name = "bazel_skylib", version = "1.6.1")
 bazel_dep(name = "imath", version = "3.1.11")
-bazel_dep(name = "libdeflate", version = "1.19")
-bazel_dep(name = "platforms", version = "0.0.8")
+bazel_dep(name = "libdeflate", version = "1.20.bcr.1")
+bazel_dep(name = "platforms", version = "0.0.10")
diff --git a/src/lib/OpenEXR/ImfScanLineInputFile.cpp b/src/lib/OpenEXR/ImfScanLineInputFile.cpp
@@ -160,7 +160,6 @@ struct sliceOptimizationData
     half fillValue; ///< if filling, the value to use
     size_t
         offset; ///< position this channel will be in the read buffer, accounting for previous channels, as well as their type
-    PixelType type; ///< type of channel
     size_t
         xStride; ///< x-stride of channel in buffer (must be set to cause channels to interleave)
     size_t