From aab6b08ad4041b2b263d504c9a6340ba1d57f59b Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 2 Apr 2024 00:37:09 +0200 Subject: [PATCH 1/2] typo fixes --- ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp | 2 +- ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 2 +- ogr/ogrsf_frmts/parquet/ogr_parquet.h | 2 +- swig/python/gdal-utils/osgeo_utils/gdalattachpct.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp b/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp index 1cef38c0f924..12a39e9a00a9 100644 --- a/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp +++ b/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp @@ -4407,7 +4407,7 @@ inline int OGRArrowLayer::GetNextArrowArray(struct ArrowArrayStream *stream, const auto nFeatureIdxCur = m_nFeatureIdx; // TODO: We likely have an issue regarding FIDs based on m_nFeatureIdx // when m_iFIDArrowColumn < 0, only a subset of row groups is - // selected, and this batch goes accross non consecutive row groups. + // selected, and this batch goes across non consecutive row groups. for (int64_t i = 0; i < m_nIdxInBatch; ++i) IncrFeatureIdx(); diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp index 8184918e7822..76e3c0ade8a8 100644 --- a/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp +++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp @@ -9970,7 +9970,7 @@ bool GDALGeoPackageDataset::AddRelationship( * * However, if we don't insert the mapping table into gpkg_contents then it is no longer * visible to some clients (eg ESRI software only allows opening tables that are present - * in gpkg_contents). So we'll do this anyway, for maximum compatiblity and flexibility. + * in gpkg_contents). So we'll do this anyway, for maximum compatibility and flexibility. * * More related discussion is at https://github.com/OSGeo/gdal/pull/9258 */ diff --git a/ogr/ogrsf_frmts/parquet/ogr_parquet.h b/ogr/ogrsf_frmts/parquet/ogr_parquet.h index b47bcd0a9c35..b55fc148a96e 100644 --- a/ogr/ogrsf_frmts/parquet/ogr_parquet.h +++ b/ogr/ogrsf_frmts/parquet/ogr_parquet.h @@ -89,7 +89,7 @@ class OGRParquetLayer final : public OGRParquetLayerBase //! Iterator over m_asFeatureIdxRemapping std::vector>::iterator m_oFeatureIdxRemappingIter{}; - //! Feature index among the potentially restricted set of selected row gropus + //! Feature index among the potentially restricted set of selected row groups int64_t m_nFeatureIdxSelected = 0; std::vector m_anRequestedParquetColumns{}; // only valid when // m_bIgnoredFields is set diff --git a/swig/python/gdal-utils/osgeo_utils/gdalattachpct.py b/swig/python/gdal-utils/osgeo_utils/gdalattachpct.py index ce9707550b16..80b88c11014f 100644 --- a/swig/python/gdal-utils/osgeo_utils/gdalattachpct.py +++ b/swig/python/gdal-utils/osgeo_utils/gdalattachpct.py @@ -127,7 +127,7 @@ def doit( if driver_name.upper() == "VRT": # For VRT, create the VRT first from the source dataset, so it - # correctly referes to it + # correctly refers to it out_ds = dst_driver.CreateCopy(dst_filename or "", src_ds) if out_ds is None: print(f"Cannot create {dst_filename}") From 1b5b090d3bd47ca2e389374330ab1c420b06ed59 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 2 Apr 2024 01:18:17 +0200 Subject: [PATCH 2/2] Prepare for GDAL 3.8.5 --- CITATION.cff | 4 +- NEWS.md | 132 ++++++++++++++++++ VERSION | 2 +- gcore/gdal_version.h.in | 6 +- swig/python/README.rst | 2 +- .../python/gdal-utils/osgeo_utils/__init__.py | 2 +- 6 files changed, 140 insertions(+), 8 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index e861d7e5ec76..9b4ed74dde21 100644 --- 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.8.4 -date-released: 2024-02-08 +version: 3.8.5 +date-released: 2024-04-02 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 index c585a7029799..60e49e261c15 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,135 @@ +# GDAL/OGR 3.8.5 Release Notes + +GDAL 3.8.5 is a bugfix release. + +## Build + +* Disable my_test_sqlite3_ext in static builds +* Fix false-positive -Wformat-truncation with clang 18 on fedora:rawhide CI +* cpl_vsil_unix_stdio_64.cpp: avoid compiler warning related to ftello() +* Fix compiler crash on gcore/overview.cpp with ICC 2024.0.2.29 (#9508) +* CMake: Fix FindGEOS to remove use of deprecated exec_program() +* CMake: fix NumPy detection when Intel MKL library is installed +* CMake: add modern Apple OS (visionOS|tvOS|watchOS) support (#9550) +* Minimal support for TileDB 2.21 to avoid build & test issues + +## GDAL 3.8.5 + +### Port + +* /vsiaz/: handle properly BlobEndpoint ending with a slash (#9519) + +### Core + +* QuietDeleteForCreateCopy(): forward source dataset open options (#9424) +* Overview/RasterIO resampling: fix infinite looping when nodata has a big + absolute value (#9427) + +### Utilities + +* gdalinfo_output.schema.json: add comment about size and proj:shape ordering +* gdalinfo -json/gdal.Info(format='json'): avoid error/exception on engineering + CRS (#9396) +* gdalwarp: cutline zero-width sliver enhancement: avoid producing invalid + polygons +* gdal2tiles.py: fix exception when -v flag is used and overview tiles are + generated (3.7.0 regression) (#9272) +* gdalattachpct.py: fix it when output file is a VRT (#9513) + +### Raster drivers + +DIMAP driver: + * add radiometric metadata + +ERS driver: + * avoid 'Attempt at recursively opening ERS dataset' when the .ers file + references a .ecw (#9352) + +GPKG driver: + * avoid invalid use of pointer aliasing that caused ICC 2024.0.2.29 to + generate invalid code (#9508) + +GRIB driver: + * avoid floating-point issues with ICC 2024.0.2.29 (#9508) + +GTiff driver: + * fix read error/use-after-free when reading COGs with mask from network + storage (#9563) + +JP2OpenJPEG driver: + * CreateCopy(): limit number of resolutions taking into account minimum block + width/height (#9236) + +OGCAPI driver: + * fix potential use-after-free on vector tiled layers + +VRT driver: + * VRTDerivedRasterBand: Support Int8, (U)Int64 with Python pixel functions + * VRT/gdal_translate -of 200% 200%: make sure that the synthetized virtual + overviews match the dimension of the source ones when possible + * VRTPansharpenedDataset: allow to specify for and + + +## OGR 3.8.5 + +### Core + +* OGRGeometry::getCurveGeometry(): avoid failures when building some compound + curves with inferred circular strings (#9382) +* OGRLayer::GetArrowSchema(): remove potential unaligned int32_t writes +* CreateFieldFromArrowSchema(): don't propagate native subtype if we have to + use a fallback main type + +### Vector drivers + +Arrow/Parquet driver: + * fix inverted logic regarding spatial filtering of multipolygon with GeoArrow + interleaved encoding + +FlatGeoBuf driver: + * Make sure vendored flatbuffers copy has a unique namespace + * implement OGRLayer::GetDataset() (#9568) + +GMLAS driver: + * fix crash when reading CityGML files (r-spatial/sf#2371) + +GPKG driver: + * Ensure that mapping tables are inserted into gpkg_contents + * Ensure that tables present in gpkgext_relations can be read + +ILI2 driver: + * emit an error and not just a warning when creating a dataset without a model + file + +ODS driver: + * declare OLCStringsAsUTF8 on newly created layers + +OpenFileGDB driver: + * Correctly use "features" as related table type (instead of "feature") + * writer: fix corrupted maximum blob size header field in some SetFeature() + scenarios (#9388) + * avoid issue with -fno-sanitize-recover=unsigned-integer-overflow with recent + clang + +Parquet driver: + * avoid potential assertion/out-of-bounds access when a subset of row groups + is selected + +PMTiles driver: + * fix 'Non increasing tile_id' error when opening some files (#9288) + +Shapefile driver: + * Fix bug when reading some .sbn spatial indices + +XLSX driver: + * declare OLCStringsAsUTF8 on newly created layers + +## Python bindings + +* gdal.Translate()/gdal.Warp()/etc.: make sure not to modify provided options[] + array (#9259) +* Fix gdal.Warp segfault with dst=None + # GDAL/OGR 3.8.4 Release Notes GDAL 3.8.4 is a bugfix release. diff --git a/VERSION b/VERSION index ff313b8c212f..0cbfaed0d9fe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.8.4 +3.8.5 diff --git a/gcore/gdal_version.h.in b/gcore/gdal_version.h.in index 7ae05d2e2133..a0a881ebe594 100644 --- a/gcore/gdal_version.h.in +++ b/gcore/gdal_version.h.in @@ -7,7 +7,7 @@ #ifndef GDAL_VERSION_MAJOR # define GDAL_VERSION_MAJOR 3 # define GDAL_VERSION_MINOR 8 -# define GDAL_VERSION_REV 4 +# define GDAL_VERSION_REV 5 # define GDAL_VERSION_BUILD 0 #endif @@ -24,9 +24,9 @@ #if !defined(DO_NOT_DEFINE_GDAL_DATE_NAME) #ifndef GDAL_RELEASE_DATE -# define GDAL_RELEASE_DATE 20240208 +# define GDAL_RELEASE_DATE 20240402 #endif #ifndef GDAL_RELEASE_NAME -# define GDAL_RELEASE_NAME "3.8.4" +# define GDAL_RELEASE_NAME "3.8.5" #endif #endif diff --git a/swig/python/README.rst b/swig/python/README.rst index bcc7d1c1af23..a64772d3cf23 100644 --- a/swig/python/README.rst +++ b/swig/python/README.rst @@ -13,7 +13,7 @@ reference documentation, but the https://gdal.org/api/python_bindings.html#tutor Dependencies ------------ - * libgdal (3.8.4 or greater) and header files (gdal-devel) + * libgdal (3.8.5 or greater) and header files (gdal-devel) * numpy (1.0.0 or greater) and header files (numpy-devel) (not explicitly required, but many examples and utilities will not work without it) diff --git a/swig/python/gdal-utils/osgeo_utils/__init__.py b/swig/python/gdal-utils/osgeo_utils/__init__.py index 227e52a3925c..f38dca9a665b 100644 --- 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, 8, 4, 0) +gdal_utils_version = (3, 8, 5, 0) __version__ = ".".join(str(i) for i in gdal_utils_version) __author__ = "Frank Warmerdam" __author_email__ = "warmerdam@pobox.com"