[geos-commits] r2252 - trunk/source/geom
svn_geos at osgeo.org
svn_geos at osgeo.org
Wed Jan 21 17:18:37 EST 2009
Author: pramsey
Date: 2009-01-21 17:18:37 -0500 (Wed, 21 Jan 2009)
New Revision: 2252
Modified:
trunk/source/geom/Geometry.cpp
Log:
Remove geometryCollection protection from Union/Relate/Intersection/Difference.
Modified: trunk/source/geom/Geometry.cpp
===================================================================
--- trunk/source/geom/Geometry.cpp 2009-01-20 01:01:24 UTC (rev 2251)
+++ trunk/source/geom/Geometry.cpp 2009-01-21 22:18:37 UTC (rev 2252)
@@ -474,8 +474,6 @@
Geometry::relate(const Geometry *other) const
//throw(IllegalArgumentException *)
{
- checkNotGeometryCollection(this);
- checkNotGeometryCollection(other);
return RelateOp::relate(this, other);
}
@@ -527,8 +525,6 @@
Geometry*
Geometry::intersection(const Geometry *other) const
{
- checkNotGeometryCollection(this);
- checkNotGeometryCollection(other);
return OverlayOp::overlayOp(this, other, OverlayOp::opINTERSECTION);
}
@@ -536,9 +532,6 @@
Geometry::Union(const Geometry *other) const
//throw(TopologyException *, IllegalArgumentException *)
{
- checkNotGeometryCollection(this);
- checkNotGeometryCollection(other);
-
Geometry *out = NULL;
#ifdef SHORTCIRCUIT_PREDICATES
@@ -581,16 +574,12 @@
Geometry::difference(const Geometry *other) const
//throw(IllegalArgumentException *)
{
- checkNotGeometryCollection(this);
- checkNotGeometryCollection(other);
return OverlayOp::overlayOp(this, other, OverlayOp::opDIFFERENCE);
}
Geometry*
Geometry::symDifference(const Geometry *other) const
{
- checkNotGeometryCollection(this);
- checkNotGeometryCollection(other);
return OverlayOp::overlayOp(this, other, OverlayOp::opSYMDIFFERENCE);
}
More information about the geos-commits
mailing list