[Git][debian-gis-team/osmcoastline][master] 2 commits: Add upstream patch to fix test-invalid-complex-overlap failure. (closes: #977868)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / osmcoastline


Commits:
b79a00b4 by Bas Couwenberg at 2020-12-22T14:58:26+01:00
Add upstream patch to fix test-invalid-complex-overlap failure. (closes: #977868)

- - - - -
f028430b by Bas Couwenberg at 2020-12-22T14:58:36+01:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/0001-Fix-segfault-in-osmcoastline.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,11 @@
-osmcoastline (2.2.4-3) UNRELEASED; urgency=medium
+osmcoastline (2.2.4-3) unstable; urgency=medium
 
   * Bump watch file version to 4.
   * Bump Standards-Version to 4.5.1, no changes.
+  * Add upstream patch to fix test-invalid-complex-overlap failure.
+    (closes: #977868)
 
- -- Bas Couwenberg <sebastic at debian.org>  Fri, 06 Nov 2020 19:39:47 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 22 Dec 2020 14:58:28 +0100
 
 osmcoastline (2.2.4-2) unstable; urgency=medium
 


=====================================
debian/patches/0001-Fix-segfault-in-osmcoastline.patch
=====================================
@@ -0,0 +1,19 @@
+Description: Fix: segfault in osmcoastline
+ This seems to have been triggered by a change in behaviour in newer
+ GDAL versions.
+Author: Jochen Topf <jochen at topf.org>
+Origin: https://github.com/osmcode/osmcoastline/commit/8dd33fb69fa36be9ca8b43e979cd0123c6d4db5e
+Bug: https://github.com/osmcode/osmcoastline/issues/39
+Bug-Debian: https://bugs.debian.org/977868
+
+--- a/src/coastline_ring_collection.cpp
++++ b/src/coastline_ring_collection.cpp
+@@ -130,7 +130,7 @@ unsigned int CoastlineRingCollection::ch
+ }
+ 
+ bool is_valid_polygon(const OGRGeometry* geometry) {
+-    if (geometry && geometry->getGeometryType() == wkbPolygon) {
++    if (geometry && geometry->getGeometryType() == wkbPolygon && !geometry->IsEmpty()) {
+         const auto polygon = static_cast<const OGRPolygon*>(geometry);
+         return (polygon->getExteriorRing()->getNumPoints() > 3) && (polygon->getNumInteriorRings() == 0) && geometry->IsValid();
+     }


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-Fix-segfault-in-osmcoastline.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/osmcoastline/-/compare/16756ee73f7387688ebd8d23ccf6aa8bead3e839...f028430b0af3259bb4eccafe686fbe771c7714a5

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmcoastline/-/compare/16756ee73f7387688ebd8d23ccf6aa8bead3e839...f028430b0af3259bb4eccafe686fbe771c7714a5
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/20201222/7cc69dda/attachment-0001.html>