[geos-commits] r3393 - in branches/3.2: . source/operation/valid tests/xmltester tests/xmltester/tests

[svn_geos at osgeo.org]

Author: strk
Date: 2011-06-09 08:41:40 -0700 (Thu, 09 Jun 2011)
New Revision: 3393

Added:
   branches/3.2/tests/xmltester/tests/bug449.xml
Modified:
   branches/3.2/NEWS
   branches/3.2/source/operation/valid/IndexedNestedRingTester.cpp
   branches/3.2/tests/xmltester/Makefile.am
Log:
Backport fix for bug #449 (#451)


Modified: branches/3.2/NEWS
===================================================================
--- branches/3.2/NEWS	2011-06-09 15:28:14 UTC (rev 3392)
+++ branches/3.2/NEWS	2011-06-09 15:41:40 UTC (rev 3393)
@@ -1,3 +1,9 @@
+Changes in 3.2.3
+2011-??-??
+
+- Bug fixes / improvements
+  - ValidOp abort in presence of 2 touching holes forming an island (#449)
+
 Changes in 3.2.2
  
 - Bug fixes:

Modified: branches/3.2/source/operation/valid/IndexedNestedRingTester.cpp
===================================================================
--- branches/3.2/source/operation/valid/IndexedNestedRingTester.cpp	2011-06-09 15:28:14 UTC (rev 3392)
+++ branches/3.2/source/operation/valid/IndexedNestedRingTester.cpp	2011-06-09 15:41:40 UTC (rev 3393)
@@ -67,8 +67,9 @@
 							 graph);
 
                         // Unable to find a ring point not a node of
-			// the search ring
-			assert(innerRingPt!=NULL);
+			// the search ring.
+			// See http://trac.osgeo.org/geos/ticket/449
+			if ( ! innerRingPt ) continue;
 
 			bool isInside = algorithm::CGAlgorithms::isPointInRing(	
 					*innerRingPt, searchRingPts);

Modified: branches/3.2/tests/xmltester/Makefile.am
===================================================================
--- branches/3.2/tests/xmltester/Makefile.am	2011-06-09 15:28:14 UTC (rev 3392)
+++ branches/3.2/tests/xmltester/Makefile.am	2011-06-09 15:41:40 UTC (rev 3393)
@@ -22,6 +22,7 @@
 	$(srcdir)/tests/bug188.xml \
 	$(srcdir)/tests/bug244.xml \
 	$(srcdir)/tests/bug275.xml \
+	$(srcdir)/tests/bug449.xml \
 	$(srcdir)/tests/general/TestBoundary.xml \
 	$(srcdir)/tests/general/TestBuffer.xml \
 	$(srcdir)/tests/general/TestBufferMitredJoin.xml \

Added: branches/3.2/tests/xmltester/tests/bug449.xml
===================================================================
--- branches/3.2/tests/xmltester/tests/bug449.xml	                        (rev 0)
+++ branches/3.2/tests/xmltester/tests/bug449.xml	2011-06-09 15:41:40 UTC (rev 3393)
@@ -0,0 +1,21 @@
+<run>
+  <precisionModel type="FLOATING" />
+
+<case>
+  <desc>
+http://trac.osgeo.org/geos/ticket/449
+  </desc>
+  <a>
+ POLYGON(
+ (0 0, 0 5, 6 5, 6 0, 0 0),
+ (2 1, 4 1, 3 2, 2 1),
+ (2 1, 1 4, 5 4, 4 1, 4 3, 3 2, 2 3, 2 1)
+ )
+  </a>
+<test>
+ <op name="isValid" arg1="A">false</op>
+</test>
+</case>
+
+
+</run>