[geos-commits] r3989 - in trunk: include/geos/geom/prep src/geom/prep

[svn_geos at osgeo.org]

Author: strk
Date: 2014-06-20 01:39:22 -0700 (Fri, 20 Jun 2014)
New Revision: 3989

Modified:
   trunk/include/geos/geom/prep/PreparedPoint.h
   trunk/src/geom/prep/PreparedPoint.cpp
Log:
Revert "Fix PreparedPoint::intersects signature to match the upper virtual"

This reverts commit r3988
The non-broken signature introduces a discrepancy between
PreparedPoint::intersects and Point::intersects
See http://trac.osgeo.org/geos/ticket/694

Modified: trunk/include/geos/geom/prep/PreparedPoint.h
===================================================================
--- trunk/include/geos/geom/prep/PreparedPoint.h	2014-06-20 07:48:30 UTC (rev 3988)
+++ trunk/include/geos/geom/prep/PreparedPoint.h	2014-06-20 08:39:22 UTC (rev 3989)
@@ -48,7 +48,7 @@
 	 * The optimization here is that computing topology for the test
 	 * geometry is avoided. This can be significant for large geometries.
 	 */
-	bool intersects(const geom::Geometry* g) const;
+	bool intersects(const geom::Geometry* g);
 
 };
 

Modified: trunk/src/geom/prep/PreparedPoint.cpp
===================================================================
--- trunk/src/geom/prep/PreparedPoint.cpp	2014-06-20 07:48:30 UTC (rev 3988)
+++ trunk/src/geom/prep/PreparedPoint.cpp	2014-06-20 08:39:22 UTC (rev 3989)
@@ -24,7 +24,7 @@
 namespace prep { // geos.geom.prep
 
 bool 
-PreparedPoint::intersects(const geom::Geometry* g) const
+PreparedPoint::intersects(const geom::Geometry* g)
 {
 	if (! envelopesIntersect( g)) return false;