Merge branch 'OSGeo:master' into i18n

.github/workflows/code_checks.yml

@@ -66,6 +66,40 @@ jobs:
           cd build
           ../scripts/cppcheck.sh
 
+  cppcheck_master:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+
+      - name: Install Requirements
+        run: |
+          sudo apt update
+          sudo apt install -y git libsqlite3-dev ccache sqlite3 libproj-dev cmake g++ make
+
+      - name: Build cppcheck
+        run: |
+          git clone https://github.com/danmar/cppcheck
+          cd cppcheck
+          mkdir build
+          cd build
+          cmake .. -DCMAKE_BUILD_TYPE=Release
+          make -j$(nproc)
+          sudo make install
+          cd ../..
+
+      - name: Run cmake
+        run: |
+          mkdir build
+          cd build
+          cmake ..
+
+      - name: Run cppcheck test
+        run: |
+          cd build
+          # Do not fail the job. This is just used as a tool to monitor how we are regarding recent cppcheck
+          ../scripts/cppcheck.sh || /bin/true
+
   code_quality_checks:
     runs-on: ubuntu-latest
     steps:
@@ -144,7 +178,8 @@ jobs:
       - name: Install Requirements
         run: |
             sudo apt install python3-pip wget
-            sudo pip3 install cffconvert
+            # ruamel.yaml.clib 0.2.9 throws a 'TypeError: a string or stream input is required' when running cffconvert --validate
+            sudo pip3 install cffconvert "ruamel.yaml.clib<0.2.9"
 
       - name: Validate citation file
         run: |

.github/workflows/ubuntu_24.04/Dockerfile.ci

@@ -32,7 +32,6 @@ RUN apt-get update && \
     libgif-dev \
     libhdf4-alt-dev \
     libhdf5-serial-dev \
-    libheif-dev \
     libjpeg-dev \
     libjxl-dev \
     libkml-dev \
@@ -74,6 +73,16 @@ RUN apt-get update && \
     wget \
     zip
 
+# temporary libheif build
+RUN apt-get install -y --allow-unauthenticated libaom-dev libbrotli-dev libde265-dev libx265-dev
+RUN git clone --depth 1 https://github.com/strukturag/libheif.git libheif-git && \
+    cd libheif-git && \
+    mkdir build && \
+    cd build && \
+    cmake --preset=develop .. && \
+    make -j$(nproc) && \
+    make install
+
 # MSSQL: client side
 RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
 RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | tee /etc/apt/sources.list.d/msprod.list

.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt

@@ -2,7 +2,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   VRT -raster,multidimensional raster- (rw+v): Virtual Raster (*.vrt)
   DERIVED -raster- (ro): Derived datasets using VRT pixel functions
   GTI -raster- (rov): GDAL Raster Tile Index (*.gti.gpkg, *.gti.fgb, *.gti)
-  SNAP_TIFF -raster- (rov): Sentinel Application Processing GeoTIFF (*.tif, *.tiff)
+  SNAP_TIFF -raster- (rov): Sentinel Application Processing GeoTIFF
   GTiff -raster- (rw+vs): GeoTIFF (*.tif, *.tiff)
   COG -raster- (wv): Cloud optimized GeoTIFF generator (*.tif, *.tiff)
   NITF -raster- (rw+vs): National Imagery Transmission Format (*.ntf)
@@ -137,7 +137,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   SIGDEM -raster- (rwv): Scaled Integer Gridded DEM .sigdem (*.sigdem)
   EXR -raster- (rw+vs): Extended Dynamic Range Image File Format (*.exr)
   AVIF -raster- (rwvs): AV1 Image File Format (*.avif)
-  HEIF -raster- (rov): ISO/IEC 23008-12:2017 High Efficiency Image File Format (*.heic)
+  HEIF -raster- (rwv): ISO/IEC 23008-12:2017 High Efficiency Image File Format (*.heic)
   TGA -raster- (rov): TGA/TARGA Image File Format (*.tga)
   OGCAPI -raster,vector- (rov): OGCAPI
   STACTA -raster- (rovs): Spatio-Temporal Asset Catalog Tiled Assets (*.json)

.github/workflows/windows_conda_expected_gdalinfo_formats.txt

@@ -2,7 +2,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   VRT -raster,multidimensional raster- (rw+v): Virtual Raster (*.vrt)
   DERIVED -raster- (ro): Derived datasets using VRT pixel functions
   GTI -raster- (rov): GDAL Raster Tile Index (*.gti.gpkg, *.gti.fgb, *.gti)
-  SNAP_TIFF -raster- (rov): Sentinel Application Processing GeoTIFF (*.tif, *.tiff)
+  SNAP_TIFF -raster- (rov): Sentinel Application Processing GeoTIFF
   GTiff -raster- (rw+vs): GeoTIFF (*.tif, *.tiff)
   COG -raster- (wv): Cloud optimized GeoTIFF generator (*.tif, *.tiff)
   NITF -raster- (rw+vs): National Imagery Transmission Format (*.ntf)
@@ -137,7 +137,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   DAAS -raster- (ro): Airbus DS Intelligence Data As A Service driver
   SIGDEM -raster- (rwv): Scaled Integer Gridded DEM .sigdem (*.sigdem)
   AVIF -raster- (rwvs): AV1 Image File Format (*.avif)
-  HEIF -raster- (rov): ISO/IEC 23008-12:2017 High Efficiency Image File Format (*.heic)
+  HEIF -raster- (rwv): ISO/IEC 23008-12:2017 High Efficiency Image File Format (*.heic)
   TGA -raster- (rov): TGA/TARGA Image File Format (*.tga)
   OGCAPI -raster,vector- (rov): OGCAPI
   STACTA -raster- (rovs): Spatio-Temporal Asset Catalog Tiled Assets (*.json)

MIGRATION_GUIDE.TXT

@@ -223,7 +223,7 @@ MIGRATION GUIDE FROM GDAL 2.4 to GDAL 3.0
  - Unix build: Arguments of --with-pg changed to yes/no only.
 - Substantial changes, sometimes backward incompatible, in coordinate reference
   system and coordinate transformations have been introduced per
-  https://trac.osgeo.org/gdal/wiki/rfc73_proj6_wkt2_srsbarn
+  https://gdal.org/en/latest/development/rfc/rfc73_proj6_wkt2_srsbarn.html
     * OSRImportFromEPSG() takes into account official axis order.
       Traditional GIS-friendly axis order can be restored with
       OGRSpatialReference::SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
@@ -295,7 +295,7 @@ MIGRATION GUIDE FROM GDAL 2.2 to GDAL 2.3
 
 1) RFC 70: Guessing output format from output file name extension for utilities
 
-Link: https://trac.osgeo.org/gdal/wiki/rfc70_output_format_guess
+Link: https://gdal.org/en/latest/development/rfc/rfc70_output_format_guess.html
 
 Before GDAL 2.3, if not specifying the output format to utilities, GeoTIFF or
 Shapefile were assumed for most utilities. Now, the output format will be
@@ -305,7 +305,7 @@ not specified (but warnings were already emitted in such situations).
 
 2) RFC 68: C++11 Compilation requirement
 
-Link: https://trac.osgeo.org/gdal/wiki/rfc68_cplusplus11
+Link: https://gdal.org/en/latest/development/rfc/rfc68_cplusplus11.html
 
 GDAL now requires a C++11 compatible compiler. External code using GDAL C++ API
 will also need to enable at least C++11 compilation mode, if the compiler
@@ -349,7 +349,7 @@ MIGRATION GUIDE FROM GDAL 2.1 to GDAL 2.2
 
 A) RFC 64: Triangle, Polyhedral surface and TIN
 
-Link: https://trac.osgeo.org/gdal/wiki/rfc64_triangle_polyhedralsurface_tin
+Link: https://gdal.org/en/latest/development/rfc/rfc64_triangle_polyhedralsurface_tin.html
 
 Vector drivers can now return geometries of type wkbPolyhedralSurface, wkbTIN
 and wkbTriangle; and their Z, M and ZM variants (as well as for the type of
@@ -358,7 +358,7 @@ writing geometries, must be ready to deal with them.
 
 B) RFC 67: Null values in OGR
 
-Link: https://trac.osgeo.org/gdal/wiki/rfc67_nullfieldvalues
+Link: https://gdal.org/en/latest/development/rfc/rfc67_nullfieldvalues.html
 
 Previously, the "unset" state of a field was used both for a unset state
 (ie no information for the field of the feature) or the NULL state of the
@@ -383,7 +383,7 @@ MIGRATION GUIDE FROM GDAL 2.0 to GDAL 2.1
 
 A) RFC 61: Support for measured geometries
 
-Link: https://trac.osgeo.org/gdal/wiki/rfc61_support_for_measured_geometries
+Link: https://gdal.org/en/latest/development/rfc/rfc61_support_for_measured_geometries.html
 
 The OGRwkbGeometryType enumeration has been extended with new values for the
 M and ZM variants of the geometry types. Client code may have to be upgraded
@@ -405,7 +405,7 @@ Changes to the Perl bindings API are listed in swig/perl/Changes-in-the-API-in-2
 
 A) RFC 46: Unification of GDAL and OGR driver models
 
-Link: http://trac.osgeo.org/gdal/wiki/rfc46_gdal_ogr_unification
+Link: https://gdal.org/en/latest/development/rfc/rfc46_gdal_ogr_unification.html
 
 C++ API:
 
@@ -449,7 +449,7 @@ Behavior changes :
 
 B) RFC 49: Curve geometries
 
-Link: http://trac.osgeo.org/gdal/wiki/rfc49_curve_geometries
+Link: https://gdal.org/en/latest/development/rfc/rfc49_curve_geometries.html
 
 C/C++ API :
 
@@ -470,7 +470,7 @@ Out-of-tree drivers :
 
 C) RFC 51: RasterIO() improvements : resampling and progress callback
 
-Link: http://trac.osgeo.org/gdal/wiki/rfc51_rasterio_resampling_progress
+Link: https://gdal.org/en/latest/development/rfc/rfc51_rasterio_resampling_progress.html
 
 Out-of-tree drivers :
 
@@ -481,7 +481,7 @@ Out-of-tree drivers :
 
 D) RFC 31: OGR 64bit Integer Fields and FIDs
 
-Link:http://trac.osgeo.org/gdal/wiki/rfc31_ogr_64
+Link: https://gdal.org/en/latest/development/rfc/rfc31_ogr_64.html
 
 C++ API:
   * OGRLayer::GetFeature(), OGRLayer::DeleteFeature(), OGRLayer::SetNextByIndex() take a GIntBig instead of a long
@@ -502,7 +502,7 @@ Out-of-tree drivers :
 
 E) RFC 52: Strict OGR SQL quoting
 
-Link: http://trac.osgeo.org/gdal/wiki/rfc52_strict_sql_quoting
+Link: https://gdal.org/en/latest/development/rfc/rfc52_strict_sql_quoting.html
 
 No API changes
 
@@ -517,7 +517,7 @@ Behavior changes:
 
 F) RFC 53: OGR not-null constraints and default values
 
-Link: http://trac.osgeo.org/gdal/wiki/rfc53_ogr_notnull_default
+Link: https://gdal.org/en/latest/development/rfc/rfc53_ogr_notnull_default.html
 
 API changes:
     * OGRFieldDefn::SetDefault() now takes a const char* as argument.
@@ -526,7 +526,7 @@ API changes:
 
 G) RFC 54: Dataset transactions
 
-Link: http://trac.osgeo.org/gdal/wiki/rfc54_dataset_transactions
+Link: https://gdal.org/en/latest/development/rfc/rfc54_dataset_transactions.html
 
 Only API additions.
 
@@ -542,15 +542,15 @@ Behavior changes:
 
 H) RFC 55: Refined SetFeature() and DeleteFeature() semantics
 
-Link: http://trac.osgeo.org/gdal/wiki/rfc55_refined_setfeature_deletefeature_semantics
+Link: https://gdal.org/en/latest/development/rfc/rfc55_refined_setfeature_deletefeature_semantics.html
 
 Behavior changes:
     * Drivers will now return OGRERR_NON_EXISTING_FEATURE when calling SetFeature()
       or DeleteFeature() with a feature id that does not exist.
 
 I) RFC 56:
 
-Link: https://trac.osgeo.org/gdal/wiki/rfc56_millisecond_precision
+Link: https://gdal.org/en/latest/development/rfc/rfc56_millisecond_precision.html
 
 API/ABI changes:
 
@@ -593,7 +593,7 @@ Behavior changes:
 
 J) RFC 57: 64-bit bucket count for histograms
 
-Link: https://trac.osgeo.org/gdal/wiki/rfc57_histogram_64bit_count
+Link: https://gdal.org/en/latest/development/rfc/rfc57_histogram_64bit_count.html
 
 C++ API:
   * GDALRasterBand::GetHistogram() and GDALRasterBand::SetDefaultHistogram() take a GUIntBig* instead of a int* for bucket counts.
@@ -616,7 +616,7 @@ This file documents backwards incompatible changes.
 C++ API:
 
   * GDALRasterAttributeTable is now an abstract class.
-    See http://trac.osgeo.org/gdal/wiki/rfc40_enhanced_rat_support
+    See https://gdal.org/en/latest/development/rfc/rfc40_enhanced_rat_support.html
     The functionality of GDAL 1.X GDALRasterAttributeTable is now in
     GDALDefaultRasterAttributeTable.
 
@@ -635,4 +635,4 @@ Changes that should likely not impact anybody :
 
    * OGRGeometryFactory::getGEOSGeometryFactory() has been removed.
      This method returned NULL since 2006
-     ( http://trac.osgeo.org/gdal/changeset/9899/trunk/ogr/ogrgeometryfactory.cpp )
+     ( https://github.com/OSGeo/gdal/commit/42d5fd976795b9c85aac2c4ffac12025e21697c1#diff-9b267dec2a69d6f56247a5525195973890780ce50ae8c9c809bf4818754f4e46L885 )