[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0rc1-197-g3efe42e

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  3efe42ec18bf1f2a9e3645049b8caf3828ef4f33 (commit)
      from  8fbce9cc5e1a4fa37f1a2019534227350eb3fac4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3efe42ec18bf1f2a9e3645049b8caf3828ef4f33
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Wed Jun 2 14:59:42 2021 -0700

    Restore logic to repair rings as necessary before handing off to GEOS, closes #4904

diff --git a/liblwgeom/lwgeom_geos.c b/liblwgeom/lwgeom_geos.c
index f74da70..77c40ec 100644
--- a/liblwgeom/lwgeom_geos.c
+++ b/liblwgeom/lwgeom_geos.c
@@ -120,9 +120,12 @@ POINTARRAY*
 ptarray_from_GEOSCoordSeq(const GEOSCoordSequence* cs, uint8_t want3d)
 {
 	uint32_t dims = 2;
-	uint32_t size = 0, i;
 	POINTARRAY* pa;
+	uint32_t size = 0;
+#if POSTGIS_GEOS_VERSION < 31000
+	uint32_t i;
 	POINT4D point = { 0.0, 0.0, 0.0, 0.0 };
+#endif
 
 	LWDEBUG(2, "ptarray_fromGEOSCoordSeq called");
 
@@ -285,7 +288,7 @@ ptarray_to_GEOSCoordSeq(const POINTARRAY* pa, uint8_t fix_ring)
 		}
 		return sq;
 	}
-#else
+#endif
         if (!(sq = GEOSCoordSeq_create(pa->npoints + append_points, dims)))
 	{
 		lwerror("Error creating GEOS Coordinate Sequence");
@@ -342,7 +345,7 @@ ptarray_to_GEOSCoordSeq(const POINTARRAY* pa, uint8_t fix_ring)
 	}
 
 	return sq;
-#endif
+
 }
 
 static inline GEOSGeometry*

-----------------------------------------------------------------------

Summary of changes:
 liblwgeom/lwgeom_geos.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
PostGIS