Merge branch 'OSGeo:master' into master

a0x8o · May 14, 2024 · 99107b0 · 99107b0
2 parents 6e5fc24 + e187124
commit 99107b0
Show file tree

Hide file tree

Showing 86 changed files with 1,482 additions and 1,027 deletions.
diff --git a/.github/workflows/android_cmake.yml b/.github/workflows/android_cmake.yml
@@ -22,7 +22,6 @@ jobs:
 
   android_cmake_build:
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - name: Checkout
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

diff --git a/.github/workflows/asan/test.sh b/.github/workflows/asan/test.sh
@@ -45,8 +45,6 @@ find -L \
         ! -name ogr_gpsbabel.py `# new-delete-type-mismatch error in gpsbabel binary that we can't suppress` \
         ! -name "__init__.py" \
         ! -path 'ogr/data/*' \
-        ! -name test_gdal_merge.py \
-        ! -name test_gdal_retile.py \
     -print \
     -exec ./pytest_wrapper.sh {} \; \
     | tee ./test-output.txt

diff --git a/.github/workflows/clang_static_analyzer.yml b/.github/workflows/clang_static_analyzer.yml
@@ -22,7 +22,6 @@ jobs:
 
   clang_static_analyzer:
     runs-on: ubuntu-22.04
-    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - name: Checkout
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml
@@ -22,7 +22,6 @@ jobs:
 
   cppcheck_2004:
     runs-on: ubuntu-20.04
-    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - name: Checkout
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
@@ -43,6 +42,29 @@ jobs:
           cd build
           ../scripts/cppcheck.sh
 
+  cppcheck_2404:
+    runs-on: ubuntu-latest
+    container: ubuntu:24.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+
+      - name: Install Requirements
+        run: |
+          apt update
+          apt install -y cppcheck libsqlite3-dev ccache sqlite3 libproj-dev cmake g++ make
+
+      - name: Run cmake
+        run: |
+          mkdir build
+          cd build
+          cmake ..
+
+      - name: Run cppcheck test
+        run: |
+          cd build
+          ../scripts/cppcheck.sh
+
   code_quality_checks:
     runs-on: ubuntu-latest
     steps:
@@ -135,7 +157,6 @@ jobs:
 
   validate_xml:
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - name: Checkout
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -23,7 +23,6 @@ permissions:
 jobs:
   build:
     name: Conda ${{ matrix.platform }}
-    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
 
     runs-on: ${{ matrix.platform }}
     strategy:

diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml
@@ -21,7 +21,6 @@ permissions:
 jobs:
 
   linux-build:
-    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
 
     # Store the components of the container name as environment variables:
     # ${CONTAINER_REGISTRY}/${CONTAINER_REGISTRY_USER}/${CONTAINER_NAME}:${CONTAINER_TAG}
@@ -111,8 +110,7 @@ jobs:
             container: ubuntu_22.04
             build_script: build.sh
             test_script: test.sh
-            # We force the host OS to be 20.04 to avoid "AddressSanitizer:DEADLYSIGNAL"
-            os: ubuntu-20.04
+            os: ubuntu-22.04
 
           - name: Ubuntu 20.04, gcc
             id: ubuntu_20.04
@@ -168,6 +166,13 @@ jobs:
           echo "CACHE_CONTAINER_TAG_CLEAN=${CACHE_CONTAINER_TAG_CLEAN}" >> ${GITHUB_ENV}
           echo "CONTAINER_NAME_FULL=${CONTAINER_REGISTRY}/${CONTAINER_REGISTRY_USER,,}/${CONTAINER_NAME}:${CONTAINER_TAG_CLEAN}"  >>${GITHUB_ENV}
 
+      # Work around segfaults in ASan/MSan jobs
+      # Cf https://github.com/libjpeg-turbo/libjpeg-turbo/commit/2dfe6c0fe9e18671105e94f7cbf044d4a1d157e6
+      # and https://github.com/actions/runner-images/issues/9491
+      - name: Set up build
+        run: |
+          sudo sysctl vm.mmap_rnd_bits=28
+
       - name: Checkout
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
 

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -23,7 +23,6 @@ jobs:
   macos_build:
     # Arm64
     runs-on: macos-14
-    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
 
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml
@@ -22,7 +22,6 @@ jobs:
 
   windows_build:
     runs-on: windows-2022
-    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
 
     strategy:
       matrix:

diff --git a/alg/gdalrasterize.cpp b/alg/gdalrasterize.cpp
@@ -874,7 +874,8 @@ static CPLErr GDALRasterizeGeometriesInternal(
  * <ul>
  * <li>"ALL_TOUCHED": May be set to TRUE to set all pixels touched
  * by the line or polygons, not just those whose center is within the polygon
- * or that are selected by brezenhams line algorithm.  Defaults to FALSE.</li>
+ * (behavior is unspecified when the polygon is just touching the pixel center)
+ * or that are selected by Brezenham's line algorithm.  Defaults to FALSE.</li>
  * <li>"BURN_VALUE_FROM": May be set to "Z" to use the Z values of the
  * geometries. dfBurnValue is added to this before burning.
  * Defaults to GDALBurnValueSrc.GBV_UserBurnValue in which case just the
@@ -1432,7 +1433,8 @@ static CPLErr GDALRasterizeGeometriesInternal(
  * not exceed the cache.</li>
  * <li>"ALL_TOUCHED": May be set to TRUE to set all pixels touched
  * by the line or polygons, not just those whose center is within the polygon
- * or that are selected by brezenhams line algorithm.  Defaults to FALSE.
+ * (behavior is unspecified when the polygon is just touching the pixel center)
+ * or that are selected by Brezenham's line algorithm.  Defaults to FALSE.
  * <li>"BURN_VALUE_FROM": May be set to "Z" to use the Z values of the</li>
  * geometries. The value from padfLayerBurnValues or the attribute field value
  * is added to this before burning. In default case dfBurnValue is burned as it
@@ -1806,7 +1808,8 @@ CPLErr GDALRasterizeLayers(GDALDatasetH hDS, int nBandCount, int *panBandList,
  * pointer.</li>
  * <li>"ALL_TOUCHED": May be set to TRUE to set all pixels touched
  * by the line or polygons, not just those whose center is within the polygon
- * or that are selected by brezenhams line algorithm.  Defaults to FALSE.</li>
+ * (behavior is unspecified when the polygon is just touching the pixel center)
+ * or that are selected by Brezenham's line algorithm.  Defaults to FALSE.</li>
  * <li>"BURN_VALUE_FROM": May be set to "Z" to use
  * the Z values of the geometries. dfBurnValue or the attribute field value is
  * added to this before burning. In default case dfBurnValue is burned as it