[geos-commits] r3252 - in trunk: src/operation/buffer tests/xmltester

[svn_geos at osgeo.org]

Author: strk
Date: 2011-02-28 06:36:07 -0800 (Mon, 28 Feb 2011)
New Revision: 3252

Modified:
   trunk/src/operation/buffer/BufferOp.cpp
   trunk/tests/xmltester/Makefile.am
Log:
Fix BufferOp::bufferFixedPrecision to use snap-rounding noder. Fixes bug #356.

Modified: trunk/src/operation/buffer/BufferOp.cpp
===================================================================
--- trunk/src/operation/buffer/BufferOp.cpp	2011-02-28 12:19:22 UTC (rev 3251)
+++ trunk/src/operation/buffer/BufferOp.cpp	2011-02-28 14:36:07 UTC (rev 3252)
@@ -193,21 +193,8 @@
 
 
 	PrecisionModel pm(1.0); // fixed as well
+	snapround::MCIndexSnapRounder inoder(pm); 
 
-//
-// FIXME: both MCIndexSnapRounder and SimpleSnapRounder
-// makes buffer_snapround.xml test fail.
-//
-#if 0 
-	snapround::MCIndexSnapRounder inoder(pm); // fail
-	snapround::SimpleSnapRounder inoder(pm); // fail
-#else
-
-	algorithm::LineIntersector li(&fixedPM);
-	IntersectionAdder ia(li);
-	MCIndexNoder inoder(&ia); // This works fine (but does not snapround)
-#endif
-
 	ScaledNoder noder(inoder, fixedPM.getScale());
 
 	BufferBuilder bufBuilder(bufParams);

Modified: trunk/tests/xmltester/Makefile.am
===================================================================
--- trunk/tests/xmltester/Makefile.am	2011-02-28 12:19:22 UTC (rev 3251)
+++ trunk/tests/xmltester/Makefile.am	2011-02-28 14:36:07 UTC (rev 3252)
@@ -25,6 +25,7 @@
 	$(srcdir)/tests/bug188.xml \
 	$(srcdir)/tests/bug244.xml \
 	$(srcdir)/tests/bug275.xml \
+	$(srcdir)/tests/bug356.xml \
 	$(srcdir)/tests/bug358.xml \
 	$(srcdir)/tests/bug360.xml \
 	$(srcdir)/tests/bug366.xml \