v7.1.1-23 update

.devcontainer/security/Dockerfile

@@ -13,6 +13,7 @@ RUN git clone --depth 1 https://github.com/strukturag/libheif
 RUN git clone --depth 1 https://github.com/uclouvain/openjpeg
 RUN git clone --depth 1 https://github.com/webmproject/libwebp
 RUN git clone --depth 1 https://github.com/madler/zlib
+RUN git clone --depth 1 https://github.com/ebiggers/libdeflate
 RUN git clone --depth 1 https://github.com/libjpeg-turbo/libjpeg-turbo
 RUN git clone --depth 1 https://github.com/xz-mirror/xz
 RUN git clone --depth 1 https://github.com/libraw/libraw
@@ -23,7 +24,7 @@ RUN git clone --depth 1 https://gitlab.com/federicomenaquintero/bzip2.git
 RUN git clone --depth 1 --recursive https://github.com/libjxl/libjxl
 RUN git -c http.sslVerify=false clone https://www.cl.cam.ac.uk/~mgk25/git/jbigkit
 
-ADD Magick++/fuzz/build_dependencies.sh build_dependencies.sh
+ADD oss-fuzz/build_dependencies.sh build_dependencies.sh
 
 ENV SRC=/ImageMagick/dependencies
 ENV WORK=/ImageMagick

.devcontainer/security/build_imagemagick.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 
-./Magick++/fuzz/build_imagemagick.sh
+./oss-fuzz/build_imagemagick.sh
 
 cat <<EOT >> /ImageMagick/etc/ImageMagick-7/policy.xml
 <policymap>

.github/workflows/app-image.yml

@@ -8,6 +8,8 @@ on:
   pull_request:
     branches:
     - main
+    paths:
+    - '.github/workflows/app-image.yml'
 
 permissions:
   contents: write
@@ -18,7 +20,7 @@ jobs:
     name: 'Create AppImage'
     runs-on: ubuntu-latest
     container:
-      image: ubuntu:18.04
+      image: ubuntu:20.04
       options: --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined
 
     strategy:
@@ -27,27 +29,26 @@ jobs:
         include:
           - compiler: gcc
             cxx_compiler: g++
+            packages: gcc g++
           - compiler: clang
             cxx_compiler: clang++
+            packages: clang
 
     steps:
     - name: Install dependencies
       run: |
         set -e
-        apt-get update -y
-        apt-get install -y autoconf curl fuse git kmod libbz2-dev libdjvulibre-dev libfontconfig-dev libfreetype6-dev libfribidi-dev libharfbuzz-dev liblcms-dev libopenexr-dev libopenjp2-7-dev libturbojpeg0-dev liblqr-dev libraqm-dev libtiff-dev libwebp-dev libx11-dev libxml2-dev liblzma-dev software-properties-common wget
+        export DEBIAN_FRONTEND=noninteractive
+        apt update -y
+        apt install -y autoconf curl fuse git kmod libbz2-dev libdjvulibre-dev libfontconfig-dev libfreetype6-dev libfribidi-dev libharfbuzz-dev liblcms-dev libopenexr-dev libopenjp2-7-dev libturbojpeg0-dev liblqr-dev libraqm-dev libtiff-dev libwebp-dev libx11-dev libxml2-dev liblzma-dev make software-properties-common wget ${{ matrix.packages }}
         add-apt-repository ppa:git-core/ppa -y
-        apt-get install -y git
+        apt install -y git
         add-apt-repository ppa:strukturag/libheif -y
         add-apt-repository ppa:strukturag/libde265 -y
-        apt-get install libheif-dev -y
+        apt install libheif-dev -y
 
     - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Install ${{ matrix.compiler }}
-      if: matrix.compiler == 'clang'
-      run: apt-get install -y ${{ matrix.compiler }}
+      uses: actions/checkout@v4
 
     - name: Download AppImage
       run: |
@@ -90,7 +91,7 @@ jobs:
         find /appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
 
     - name: Upload ImageMagick AppImage
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: AppImage-${{ matrix.compiler }}
         path: artifacts
@@ -104,7 +105,7 @@ jobs:
 
     steps:
     - name: Download artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         path: artifacts
 

.github/workflows/codeql-analysis.yml

@@ -20,7 +20,7 @@ jobs:
         modules: [ 'with-modules', 'without-modules' ]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 2
 
@@ -31,7 +31,7 @@ jobs:
         echo "" > config.status
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: cpp
 
@@ -40,4 +40,4 @@ jobs:
         make
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/daily.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -32,7 +32,7 @@ jobs:
         mv ChangeLog.md artifacts/ChangeLog.md
 
     - name: Upload ChangeLog.md
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ChangeLog
         path: artifacts
@@ -76,7 +76,7 @@ jobs:
         apt-get install -y autoconf libfontconfig1-dev libfreetype6-dev libltdl-dev make pkg-config ${{ matrix.packages }}
 
     - name: Clone msttcorefonts
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: ImageMagick/msttcorefonts
         ref: refs/heads/main
@@ -86,7 +86,7 @@ jobs:
         set -e
         ./install.sh
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Configure ImageMagick
       env:
@@ -130,7 +130,7 @@ jobs:
 
     steps:
     - name: Clone ImageMagick-Windows
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: ImageMagick/ImageMagick-Windows
         path: ImageMagick-Windows
@@ -143,7 +143,7 @@ jobs:
         CloneRepositories.cmd https://github.com/ImageMagick shallow
 
     - name: Download ChangeLog.md
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: ChangeLog
         path: ImageMagick-Windows\ImageMagick
@@ -181,7 +181,7 @@ jobs:
 
     steps:
     - name: Clone ImageMagick-Windows
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: ImageMagick/ImageMagick-Windows
         path: ImageMagick-Windows
@@ -232,9 +232,9 @@ jobs:
     - name: Prepare git
       run: git config --global core.autocrlf false
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         repository: ImageMagick/ImageMagick-Windows
         path: ImageMagick-Windows

.github/workflows/main.yml

@@ -31,7 +31,7 @@ jobs:
             packages: clang
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install dependencies
       run: |
@@ -62,7 +62,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install dependencies
       run: |
@@ -92,11 +92,11 @@ jobs:
         platform: [ x86, x64, arm64 ]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: ImageMagick
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         repository: ImageMagick/ImageMagick-Windows
         path: ImageMagick-Windows
@@ -136,9 +136,9 @@ jobs:
     - name: Prepare git
       run: git config --global core.autocrlf false
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         repository: ImageMagick/ImageMagick-Windows
         path: ImageMagick-Windows

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -37,7 +37,7 @@ jobs:
         mv ChangeLog.md artifacts/ChangeLog.md
 
     - name: Upload ChangeLog.md
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ChangeLog
         path: artifacts
@@ -73,7 +73,7 @@ jobs:
             hdri_flag: '-HDRI'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         repository: ImageMagick/ImageMagick-Windows
         path: ImageMagick-Windows
@@ -86,7 +86,7 @@ jobs:
         CloneRepositories.cmd https://github.com/ImageMagick shallow
 
     - name: Download ChangeLog.md
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: ChangeLog
         path: ImageMagick-Windows\ImageMagick
@@ -184,9 +184,19 @@ jobs:
         timestamp-digest: SHA256
         timeout: 600
 
-    - uses: actions/upload-artifact@v3
+    - name: Get version
+      id: version
+      shell: pwsh
+      run: |
+        $version = (cat "ImageMagick-Windows\VisualMagick\installer\inc\version.isx" | Select-String "MagickPackageFullVersionText") | Out-String
+        $version = ($version | Select-String '".*"' -AllMatches |  Select -Expand Matches | Select -Expand Value | Out-String)
+        $version = $version -Replace "`n|`r|""",""
+        $version = $version -Replace " ","-"
+        echo "version=$version" >> $env:GITHUB_OUTPUT
+
+    - uses: actions/upload-artifact@v4
       with:
-        name: installers
+        name: 'ImageMagick-${{steps.version.outputs.version}}-installer-${{matrix.quantum}}${{matrix.hdri_flag}}-${{matrix.type}}-${{matrix.platform}}'
         path: 'ImageMagick-Windows\VisualMagick\installer\output'
 
   release_windows_source:
@@ -196,7 +206,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         repository: ImageMagick/ImageMagick-Windows
         path: ImageMagick-Windows
@@ -209,7 +219,7 @@ jobs:
         CloneRepositories.cmd https://github.com/ImageMagick source
 
     - name: Download ChangeLog.md
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: ChangeLog
         path: ImageMagick-Windows\ImageMagick
@@ -220,7 +230,7 @@ jobs:
         cd ImageMagick-Windows
         7z a ImageMagick-Windows.7z .\source\*
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: ImageMagick-Windows
         path: 'ImageMagick-Windows\ImageMagick-Windows.7z'
@@ -251,7 +261,7 @@ jobs:
             hdri_flag: '-HDRI'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         repository: ImageMagick/ImageMagick-Windows
         path: ImageMagick-Windows
@@ -264,7 +274,7 @@ jobs:
         CloneRepositories.cmd https://github.com/ImageMagick shallow
 
     - name: Download ChangeLog.md
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: ChangeLog
         path: ImageMagick-Windows\ImageMagick
@@ -339,7 +349,7 @@ jobs:
         $version = $version -Replace " ","-"
         echo "version=$version" >> $env:GITHUB_OUTPUT
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: 'ImageMagick-${{steps.package.outputs.version}}-portable-${{matrix.quantum}}${{matrix.hdri_flag}}-${{matrix.platform}}'
         path: portable