[Git][debian-gis-team/gdal-grass][upstream] New upstream version 1.0.4~rc1

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / gdal-grass


Commits:
0addd5ff by Bas Couwenberg at 2025-06-11T21:24:05+02:00
New upstream version 1.0.4~rc1
- - - - -


3 changed files:

- ogrgrass.h
- ogrgrasslayer.cpp
- utils/generate_release_notes.py


Changes:

=====================================
ogrgrass.h
=====================================
@@ -30,6 +30,7 @@
 #ifndef OGRGRASS_H_INCLUDED
 #define OGRGRASS_H_INCLUDED
 
+#include "gdal_version.h"
 #include "ogrsf_frmts.h"
 
 extern "C"
@@ -56,12 +57,19 @@ class OGRGRASSLayer final : public OGRLayer
         return poFeatureDefn;
     }
     GIntBig GetFeatureCount(int) override;
+
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
+    OGRErr IGetExtent(int iGeomField, OGREnvelope *psExtent, bool bForce)
+        override;
+#else
     OGRErr GetExtent(OGREnvelope *psExtent, int bForce) override;
     virtual OGRErr GetExtent(int iGeomField, OGREnvelope *psExtent,
                              int bForce) override
     {
         return OGRLayer::GetExtent(iGeomField, psExtent, bForce);
     }
+#endif
+
     virtual OGRSpatialReference *GetSpatialRef() override;
     int TestCapability(const char *) override;
 
@@ -73,11 +81,16 @@ class OGRGRASSLayer final : public OGRLayer
 
     // Filters
     virtual OGRErr SetAttributeFilter(const char *query) override;
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
+    virtual OGRErr ISetSpatialFilter(int iGeomField,
+                                     const OGRGeometry *poGeom) override;
+#else
     virtual void SetSpatialFilter(OGRGeometry *poGeomIn) override;
     virtual void SetSpatialFilter(int iGeomField, OGRGeometry *poGeom) override
     {
         OGRLayer::SetSpatialFilter(iGeomField, poGeom);
     }
+#endif
 
   private:
     char *pszName;


=====================================
ogrgrasslayer.cpp
=====================================
@@ -643,11 +643,20 @@ bool OGRGRASSLayer::ResetSequentialCursor()
 /************************************************************************/
 /*                           SetSpatialFilter                           */
 /************************************************************************/
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
+OGRErr OGRGRASSLayer::ISetSpatialFilter(int iGeomField,
+                                        const OGRGeometry *poGeomIn)
+#else
 void OGRGRASSLayer::SetSpatialFilter(OGRGeometry *poGeomIn)
+#endif
 {
     CPLDebug("GRASS", "SetSpatialFilter");
 
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
+    OGRLayer::ISetSpatialFilter(iGeomField, poGeomIn);
+#else
     OGRLayer::SetSpatialFilter(poGeomIn);
+#endif
 
     if (poGeomIn == NULL)
     {
@@ -657,10 +666,14 @@ void OGRGRASSLayer::SetSpatialFilter(OGRGeometry *poGeomIn)
             CPLFree(paSpatialMatch);
             paSpatialMatch = NULL;
         }
-        return;
     }
-
-    SetSpatialMatch();
+    else
+    {
+        SetSpatialMatch();
+    }
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
+    return OGRERR_NONE;
+#endif
 }
 
 /************************************************************************/
@@ -1071,7 +1084,12 @@ GIntBig OGRGRASSLayer::GetFeatureCount(int bForce)
 /*                                                                      */
 /*      Returns OGRERR_NONE/OGRRERR_FAILURE.                            */
 /************************************************************************/
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
+OGRErr OGRGRASSLayer::IGetExtent(int /*iGeomField */, OGREnvelope *psExtent,
+                                 bool /*bForce*/)
+#else
 OGRErr OGRGRASSLayer::GetExtent(OGREnvelope *psExtent, int /*bForce*/)
+#endif
 {
     struct bound_box box;
 


=====================================
utils/generate_release_notes.py
=====================================
@@ -65,7 +65,7 @@ def split_to_categories(changes, categories):
 
 
 def print_section_heading_2(text, file=None):
-    print(f"### {text}\n", file=file)
+    print(f"## {text}\n", file=file)
 
 
 def print_section_heading_3(text, file=None):



View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/commit/0addd5ff48121fb83c6be135cb7e5ea8388350c0

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/commit/0addd5ff48121fb83c6be135cb7e5ea8388350c0
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20250611/2348d06f/attachment-0001.htm>