[geos-commits] r3372 - in trunk: include/geos/noding src src/noding/snapround src/operation/overlay

[svn_geos at osgeo.org]

Author: warmerdam
Date: 2011-05-19 12:32:06 -0700 (Thu, 19 May 2011)
New Revision: 3372

Modified:
   trunk/include/geos/noding/SegmentPointComparator.h
   trunk/src/Makefile.vc
   trunk/src/noding/snapround/MCIndexSnapRounder.cpp
   trunk/src/operation/overlay/PolygonBuilder.cpp
Log:
Updates for Makefile.vc builds and issues when building NDEBUG and no inlining

Modified: trunk/include/geos/noding/SegmentPointComparator.h
===================================================================
--- trunk/include/geos/noding/SegmentPointComparator.h	2011-05-19 14:58:31 UTC (rev 3371)
+++ trunk/include/geos/noding/SegmentPointComparator.h	2011-05-19 19:32:06 UTC (rev 3372)
@@ -21,6 +21,7 @@
 
 #include <geos/export.h>
 #include <geos/geom/Coordinate.h>
+#include <cassert>
 
 namespace geos {
 namespace noding { // geos.noding

Modified: trunk/src/Makefile.vc
===================================================================
--- trunk/src/Makefile.vc	2011-05-19 14:58:31 UTC (rev 3371)
+++ trunk/src/Makefile.vc	2011-05-19 19:32:06 UTC (rev 3372)
@@ -86,6 +86,7 @@
 	geom\util\GeometryTransformer.$(EXT) \
 	geom\util\GeometryCombiner.$(EXT) \
 	geom\util\ShortCircuitedGeometryVisitor.$(EXT) \
+	geom\util\SineStarFactory.$(EXT) \
 	geom\prep\AbstractPreparedPolygonContains.$(EXT) \
 	geom\prep\BasicPreparedGeometry.$(EXT) \
 	geom\prep\PreparedGeometry.$(EXT) \
@@ -105,7 +106,6 @@
 	geomgraph\Edge.$(EXT) \
 	geomgraph\EdgeEnd.$(EXT) \
 	geomgraph\EdgeEndStar.$(EXT) \
-	geomgraph\EdgeIntersection.$(EXT) \
 	geomgraph\EdgeIntersectionList.$(EXT) \
 	geomgraph\EdgeList.$(EXT) \
 	geomgraph\EdgeNodingValidator.$(EXT) \
@@ -202,6 +202,7 @@
 	operation\buffer\BufferSubgraph.$(EXT) \
 	operation\buffer\OffsetCurveBuilder.$(EXT) \
 	operation\buffer\OffsetCurveSetBuilder.$(EXT) \
+	operation\buffer\OffsetSegmentGenerator.$(EXT) \
 	operation\buffer\RightmostEdgeFinder.$(EXT) \
 	operation\buffer\SubgraphDepthLocater.$(EXT) \
 	operation\distance\ConnectedElementLocationFilter.$(EXT) \
@@ -247,7 +248,11 @@
 	operation\relate\RelateNodeFactory.$(EXT) \
 	operation\relate\RelateNodeGraph.$(EXT) \
 	operation\relate\RelateOp.$(EXT) \
+	operation\sharedpaths\SharedPathsOp.$(EXT) \
 	operation\union\CascadedPolygonUnion.$(EXT) \
+	operation\union\CascadedUnion.$(EXT) \
+	operation\union\PointGeometryUnion.$(EXT) \
+	operation\union\UnaryUnionOp.$(EXT) \
 	operation\valid\ConnectedInteriorTester.$(EXT) \
 	operation\valid\ConsistentAreaTester.$(EXT) \
 	operation\valid\IndexedNestedRingTester.$(EXT) \

Modified: trunk/src/noding/snapround/MCIndexSnapRounder.cpp
===================================================================
--- trunk/src/noding/snapround/MCIndexSnapRounder.cpp	2011-05-19 14:58:31 UTC (rev 3371)
+++ trunk/src/noding/snapround/MCIndexSnapRounder.cpp	2011-05-19 19:32:06 UTC (rev 3372)
@@ -32,10 +32,6 @@
 #include <vector>
 
 
-#ifndef GEOS_INLINE
-# include <geos/noding/snapround/MCIndexSnapRounder.inl>
-#endif
-
 using namespace std;
 using namespace geos::geom;
 

Modified: trunk/src/operation/overlay/PolygonBuilder.cpp
===================================================================
--- trunk/src/operation/overlay/PolygonBuilder.cpp	2011-05-19 14:58:31 UTC (rev 3371)
+++ trunk/src/operation/overlay/PolygonBuilder.cpp	2011-05-19 19:32:06 UTC (rev 3372)
@@ -244,9 +244,13 @@
 #endif
 		}
 	}
+
+#ifndef NDEBUG
 	if ( shellCount > 1 ) {
 		throw util::TopologyException("found two shells in MinimalEdgeRing list");
 	}
+#endif
+
 	return shell;
 }