Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from OSGeo:master #195

Merged
merged 4 commits into from
Feb 19, 2025
Merged

[pull] master from OSGeo:master #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19690a5
GPKG: make it compatibile with SQLite 3.49.1 in SQLITE_DQS=0 mode (ag…
rouault Feb 18, 2025
5adc13b
SQLite dialect: make it compatibile with SQLite 3.49.1 in SQLITE_DQS=…
rouault Feb 18, 2025
8343818
Revert "Fix doc building"
rouault Feb 18, 2025
45ebf24
Revert "Doc: add Gulf of Mexico nickname"
rouault Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ XODR driver:
* Fix typo in handling of Translate widthPct, heightPct
* add relatedFieldNameMatch parameter to gdal.VectorTranslate()

# GDAL/OGR 3.10.2 "Gulf of Mexico" Release Notes
# GDAL/OGR 3.10.2 Release Notes

GDAL 3.10.2 is a bugfix release.

Expand Down
2 changes: 1 addition & 1 deletion doc/source/about_no_title.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GDAL is a translator library for raster and vector geospatial data formats that is released under an MIT style Open Source :ref:`license` by the `Open Source Geospatial Foundation`_. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing. The `NEWS`_ page describes the February 2025 GDAL/OGR 3.10.2 "Gulf Of Mexico" release.
GDAL is a translator library for raster and vector geospatial data formats that is released under an MIT style Open Source :ref:`license` by the `Open Source Geospatial Foundation`_. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing. The `NEWS`_ page describes the February 2025 GDAL/OGR 3.10.2 release.

.. only:: html

Expand Down
4 changes: 2 additions & 2 deletions doc/source/download.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ Source Code
Current Release
...............

* **2025-02-14** `gdal-3.10.2.tar.gz`_ `3.10.2 "Gulf of Mexico" Release Notes`_ (`3.10.2 md5`_)
* **2025-02-14** `gdal-3.10.2.tar.gz`_ `3.10.2 Release Notes`_ (`3.10.2 md5`_)

.. _`3.10.2 "Gulf of Mexico" Release Notes`: https://github.com/OSGeo/gdal/blob/v3.10.2/NEWS.md
.. _`3.10.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.10.2/NEWS.md
.. _`gdal-3.10.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.10.2/gdal-3.10.2.tar.gz
.. _`3.10.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.10.2/gdal-3.10.2.tar.gz.md5

Expand Down
8 changes: 4 additions & 4 deletions ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7295,11 +7295,11 @@ OGRErr OGRGeoPackageTableLayer::AlterGeomFieldDefn(
CPLString()
.Printf(
"UPDATE gpkg_geometry_columns SET column_name = '%s' "
"WHERE lower(table_name) = lower(\"%s\") "
"AND lower(column_name) = lower(\"%s\")",
"WHERE lower(table_name) = lower('%s') "
"AND lower(column_name) = lower('%s')",
SQLEscapeLiteral(poNewGeomFieldDefn->GetNameRef()).c_str(),
SQLEscapeName(m_pszTableName).c_str(),
SQLEscapeName(poGeomFieldDefn->GetNameRef()).c_str())
SQLEscapeLiteral(m_pszTableName).c_str(),
SQLEscapeLiteral(poGeomFieldDefn->GetNameRef()).c_str())
.c_str());
if (eErr != OGRERR_NONE)
{
Expand Down
4 changes: 2 additions & 2 deletions ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,9 @@ static void OGR2SQLITEAddLayer(const char *&pszStart, int &nNum,
{
oLayerDesc.osSubstitutedName =
CPLString().Printf("_OGR_%d", nNum++);
osModifiedSQL += "\"";
osModifiedSQL += "'";
osModifiedSQL += oLayerDesc.osSubstitutedName;
osModifiedSQL += "\"";
osModifiedSQL += "'";
}
else
{
Expand Down
Loading