Merge branch 'OSGeo:master' into master

Mbucari · web-flow · commit c56df59e30c4 · 2026-04-15T14:27:03.000-06:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ permissions:
   contents: read
 
 env:
-  PROJ_VERSION: "9.7.0"
+  PROJ_VERSION: "9.8.1"
 
 jobs:
   safety_checks:
diff --git a/.github/workflows/ubuntu_26.04/expected_gdalinfo_formats.txt b/.github/workflows/ubuntu_26.04/expected_gdalinfo_formats.txt
@@ -99,7 +99,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
   BYN -raster- (rov): Natural Resources Canada's Geoid (*.byn, *.err)
   NOAA_B -raster- (rov): NOAA GEOCON/NADCON5 .b format (*.b)
   NSIDCbin -raster- (rov): NSIDC Sea Ice Concentrations binary (.bin) (*.bin)
-  CPHD -raster,multidimensional raster- (ro): Compensated Phase History Data Reader
+  CPHD -multidimensional raster- (ro): Compensated Phase History Data Reader
   RIK -raster- (rov): Swedish Grid RIK (.rik) (*.rik)
   USGSDEM -raster- (rov): USGS Optional ASCII DEM (and CDED) (*.dem)
   GXF -raster- (rov): GeoSoft Grid Exchange Format (*.gxf)
diff --git a/.github/workflows/windows_conda_expected_gdalinfo_formats.txt b/.github/workflows/windows_conda_expected_gdalinfo_formats.txt
@@ -133,7 +133,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update,
   GDALG -raster,vector- (rov): GDAL Streamed Algorithm driver (*.gdalg.json)
   E57 -raster- (rovs): ASTM E57 3D file format (image part) (*.e57)
   NSIDCbin -raster- (rov): NSIDC Sea Ice Concentrations binary (.bin) (*.bin)
-  CPHD -raster,multidimensional raster- (ro): Compensated Phase History Data Reader
+  CPHD -multidimensional raster- (ro): Compensated Phase History Data Reader
   TileDB -raster,multidimensional raster,vector- (rw+uvs): TileDB
   GPKG -raster,vector- (rw+uvs): GeoPackage (*.gpkg, *.gpkg.zip)
   OpenFileGDB -raster,vector- (rw+uv): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
diff --git a/CITATION b/CITATION
@@ -1,6 +1,6 @@
 To cite GDAL/OGR in publications use:
 
-  GDAL/OGR contributors (2025). GDAL/OGR Geospatial Data Abstraction
+  GDAL/OGR contributors (2026). GDAL/OGR Geospatial Data Abstraction
   software Library. Open Source Geospatial Foundation. URL https://gdal.org
   DOI: 10.5281/zenodo.5884351
 
@@ -10,7 +10,7 @@ A BibTeX entry for LaTeX users is
     title = {{GDAL/OGR} Geospatial Data Abstraction software Library},
     author = {{GDAL/OGR contributors}},
     organization = {Open Source Geospatial Foundation},
-    year = {2025},
+    year = {2026},
     url = {https://gdal.org},
     doi = {10.5281/zenodo.5884351},
   }
diff --git a/CITATION.cff b/CITATION.cff
@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: Please cite this software using these metadata or in the CITATION file.
 type: software
 title: GDAL
-version: 3.12.0
-date-released: 2025-11-03
+version: 3.13.0beta1
+date-released: 2026-04-15
 doi: 10.5281/zenodo.5884351
 abstract: GDAL is a translator library for raster and vector geospatial data
   formats that is released under an MIT style Open Source License by the Open
diff --git a/NEWS.md b/NEWS.md
diff --git a/autotest/gcore/data/hdf4/issue_14363.he4 b/autotest/gcore/data/hdf4/issue_14363.he4
diff --git a/autotest/gcore/hdf4_read.py b/autotest/gcore/hdf4_read.py
@@ -607,3 +607,15 @@ def test_hdf4_gh_14356():
         pytest.skip()
 
     gdal.Open("data/hdf4/issue_14356.he4")
+
+
+###############################################################################
+# Test bugfix for https://github.com/OSGeo/gdal/issues/14363
+
+
+def test_hdf4_gh_14363():
+
+    if gdaltest.hdf4_drv is None:
+        pytest.skip()
+
+    gdal.Open("data/hdf4/issue_14363.he4")
diff --git a/autotest/gcore/hdf4multidim.py b/autotest/gcore/hdf4multidim.py
@@ -541,3 +541,14 @@ def test_hdf4_multidim_gh_14356():
     ds = gdal.OpenEx("data/hdf4/issue_14356.he4", gdal.OF_MULTIDIM_RASTER)
 
     gdal.MultiDimInfo(ds)
+
+
+###############################################################################
+# Test bugfix for https://github.com/OSGeo/gdal/issues/14363
+
+
+def test_hdf4_multidim_gh_14363():
+
+    ds = gdal.OpenEx("data/hdf4/issue_14363.he4", gdal.OF_MULTIDIM_RASTER)
+
+    gdal.MultiDimInfo(ds)
diff --git a/doc/source/drivers/vector/esrijson.rst b/doc/source/drivers/vector/esrijson.rst
@@ -92,5 +92,4 @@ See Also
 --------
 
 -  :ref:`GeoJSON driver <vector.geojson>`
--  `GeoServices REST
-   Specification <http://www.esri.com/industries/landing-pages/geoservices/geoservices.html>`__
+-  `GeoServices REST Specification <https://geoservices.github.io/>`__
diff --git a/doc/source/user/migration_guide.rst b/doc/source/user/migration_guide.rst
@@ -43,6 +43,16 @@ From GDAL 3.12 to GDAL 3.13
     ``char **`` to use ``CSLConstList`` instead. Such change is compatible with
     earlier GDAL versions.
 
+- Behavior changes:
+
+  * RasterIO resampling/VRT: do it by default in the output buffer type
+    unless new field GDALRasterIOExtraArg::bOperateInBufType in set to false
+    (#14221).
+    For example, now by default is using non-nearest resampling in RasterIO()
+    to read a Byte band into a Float32 buffer, the result will generally be
+    non-integer values, matching what is assumed to be the default wished
+    behavior.
+
 From GDAL 3.11 to GDAL 3.12
 ---------------------------
 
diff --git a/frmts/hdf4/hdf-eos/GDapi.c b/frmts/hdf4/hdf-eos/GDapi.c
@@ -3147,7 +3147,10 @@ GDnentries(int32 gridID, int32 entrycode, int32 * strbufsize)
 		     * Get all string values Don't count quotes
 		     */
 		    EHgetmetavalue(metaptrs, &valName[i][0], utlstr);
-		    *strbufsize += (int32)strlen(utlstr) - 2;
+		    if( utlstr[0] == '"' && utlstr[strlen(utlstr)-1] == '"' )
+		        *strbufsize += (int32)strlen(utlstr) - 2;
+		    else
+		        *strbufsize += (int32)strlen(utlstr);
 		}
 		/* Increment number of entries */
 		nEntries++;
diff --git a/gcore/gdal_version.h.in b/gcore/gdal_version.h.in
@@ -23,10 +23,10 @@
 
 #if !defined(DO_NOT_DEFINE_GDAL_DATE_NAME)
 #ifndef GDAL_RELEASE_DATE
-#  define GDAL_RELEASE_DATE     20259999
+#  define GDAL_RELEASE_DATE     20260415
 #endif
 #ifndef GDAL_RELEASE_NAME
-#  define GDAL_RELEASE_NAME     "3.13.0dev"
+#  define GDAL_RELEASE_NAME     "3.13.0beta1"
 #endif
 
 #ifndef GDAL_RELEASE_NICKNAME
diff --git a/gdal.cmake b/gdal.cmake
@@ -6,8 +6,8 @@
 # a new member or virtual function in a public C++ class, etc.
 # This will typically happen for each GDAL feature release (change of X or Y in
 # a X.Y.Z numbering scheme), but should not happen for a bugfix release (change of Z)
-# Previous value: 38 for GDAL 3.12
-set(GDAL_SOVERSION 38)
+# Previous value: 39 for GDAL 3.13
+set(GDAL_SOVERSION 39)
 
 # Switches to control build targets(cached)
 option(ENABLE_GNM "Build GNM (Geography Network Model) component" ON)
diff --git a/scripts/gdal-bash-completion.sh b/scripts/gdal-bash-completion.sh
@@ -1119,7 +1119,7 @@ _gdal_viewshed()
   cur="${COMP_WORDS[$COMP_CWORD]}"
   case "$cur" in
     -*)
-      key_list="--help --long-usage --help-general -of -ox -oy -oz -vv -iv -ov -co -a_nodata -tz -md -j -cc -b -om -os --quiet --version --build --license --formats --format --optfile --config --debug --pause --locale "
+      key_list="--help --long-usage --help-general -of -ox -oy -oz -vv -iv -ov -co -a_nodata -tz -md -j -cc -b -om -os -sd --quiet --version --build --license --formats --format --optfile --config --debug --pause --locale "
       if [ "$CURRENT_SHELL" = "bash" ]; then
         mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
       else
diff --git a/swig/python/README.rst b/swig/python/README.rst
@@ -31,7 +31,7 @@ special about gdal.)
 
  * SWIG (4 or greater).
 
- * libgdal (3.12.0 or greater).
+ * libgdal (3.13.0 or greater).
 
  * numpy (1.0.0 or greater).  This is not force-required by the build,
    but many examples and utilities will not work without it.  At least
diff --git a/swig/python/gdal-utils/osgeo_utils/__init__.py b/swig/python/gdal-utils/osgeo_utils/__init__.py
@@ -1,5 +1,5 @@
 __package_name__ = "gdal-utils"
-gdal_utils_version = (3, 12, 99, 0)
+gdal_utils_version = (3, 13, 0, 0)
 __version__ = ".".join(str(i) for i in gdal_utils_version)
 __author__ = "Frank Warmerdam"
 __author_email__ = "warmerdam@pobox.com"
