[geos-commits] r3212 - trunk/src/geom

[svn_geos at osgeo.org]

Author: strk
Date: 2011-02-13 12:03:26 -0800 (Sun, 13 Feb 2011)
New Revision: 3212

Modified:
   trunk/src/geom/Geometry.cpp
Log:
Always use BinaryOp for overlay operations accessible from Geometry

Modified: trunk/src/geom/Geometry.cpp
===================================================================
--- trunk/src/geom/Geometry.cpp	2011-02-13 19:54:01 UTC (rev 3211)
+++ trunk/src/geom/Geometry.cpp	2011-02-13 20:03:26 UTC (rev 3212)
@@ -535,7 +535,7 @@
 		return getFactory()->createGeometryCollection();
 	}
 
-	return SnapIfNeededOverlayOp::overlayOp(*this, *other, OverlayOp::opINTERSECTION).release();
+	return BinaryOp(this, other, overlayOp(OverlayOp::opINTERSECTION)).release();
 }
 
 Geometry*
@@ -605,7 +605,7 @@
 	if (isEmpty()) return getFactory()->createGeometryCollection();
 	if (other->isEmpty()) return clone();
 
-	return SnapIfNeededOverlayOp::overlayOp(*this, *other, OverlayOp::opDIFFERENCE).release();
+	return BinaryOp(this, other, overlayOp(OverlayOp::opDIFFERENCE)).release();
 }
 
 Geometry*
@@ -615,7 +615,7 @@
 	if ( isEmpty() ) return other->clone();
 	if ( other->isEmpty() ) return clone();
 
-	return SnapIfNeededOverlayOp::overlayOp(*this, *other, OverlayOp::opSYMDIFFERENCE).release();
+	return BinaryOp(this, other, overlayOp(OverlayOp::opSYMDIFFERENCE)).release();
 }
 
 int