[geos-commits] r4110 - in branches/3.5: . src/geom/util

[svn_geos at osgeo.org]

Author: strk
Date: 2015-10-13 04:43:37 -0700 (Tue, 13 Oct 2015)
New Revision: 4110

Modified:
   branches/3.5/NEWS
   branches/3.5/src/geom/util/GeometryEditor.cpp
Log:
Fix GeometryEditor to correctly update factory of empty geometries

Closes #749

Modified: branches/3.5/NEWS
===================================================================
--- branches/3.5/NEWS	2015-10-13 11:20:53 UTC (rev 4109)
+++ branches/3.5/NEWS	2015-10-13 11:43:37 UTC (rev 4110)
@@ -3,8 +3,8 @@
 
 - Bug fixes / improvements
   - Fix memory leaks in single-sided buffers (#747), PlanarGraph and tests
+  - Fix GeometryEditor to correctly update factory of empty geometries (#749)
 
-
 Changes in 3.5.0
 2015-08-15
 

Modified: branches/3.5/src/geom/util/GeometryEditor.cpp
===================================================================
--- branches/3.5/src/geom/util/GeometryEditor.cpp	2015-10-13 11:20:53 UTC (rev 4109)
+++ branches/3.5/src/geom/util/GeometryEditor.cpp	2015-10-13 11:43:37 UTC (rev 4110)
@@ -112,6 +112,13 @@
 	if (newPolygon->isEmpty()) {
 		//RemoveSelectedPlugIn relies on this behaviour. [Jon Aquino]
 		return newPolygon;
+		if ( newPolygon->getFactory() != factory ) {
+			Polygon *ret = factory->createPolygon(NULL, NULL);
+			delete newPolygon;
+			return ret;
+		} else {
+			return newPolygon;
+		}
 	}
 
 	Geometry* editResult = edit(newPolygon->getExteriorRing(),operation);