[geos-commits] [SCM] GEOS branch master updated. d037cb234be09dc0ffe917cab9a263b701d3f3ea

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  d037cb234be09dc0ffe917cab9a263b701d3f3ea (commit)
       via  791fd4567e4b7058640984b98f142903c7268d33 (commit)
       via  18f5db983d506406e4cb95f42f6c64a49cc449fc (commit)
      from  24652fb98c4da0ef41d8f21d6dd021b680e62fcd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d037cb234be09dc0ffe917cab9a263b701d3f3ea
Merge: 24652fb 791fd45
Author: Daniel Baston <dbaston at gmail.com>
Date:   Mon Dec 10 10:43:14 2018 -0500

    Merge branch 'doskabouter-fixtodo'


commit 791fd4567e4b7058640984b98f142903c7268d33
Merge: 24652fb 18f5db9
Author: Daniel Baston <dbaston at gmail.com>
Date:   Mon Dec 10 10:42:57 2018 -0500

    Merge branch 'fixtodo' of https://github.com/doskabouter/geos into doskabouter-fixtodo


commit 18f5db983d506406e4cb95f42f6c64a49cc449fc
Author: doskabouter <paul.doskabouter at gmail.com>
Date:   Sun Dec 9 16:30:05 2018 +0100

    Fixed todo

diff --git a/src/operation/polygonize/EdgeRing.cpp b/src/operation/polygonize/EdgeRing.cpp
index 1d01e21..93ebd38 100644
--- a/src/operation/polygonize/EdgeRing.cpp
+++ b/src/operation/polygonize/EdgeRing.cpp
@@ -103,8 +103,7 @@ EdgeRing::ptNotInList(const CoordinateSequence *testPts,
     for (std::size_t i = 0; i < npts; ++i)
     {
         const Coordinate& testPt = testPts->getAt(i);
-        // TODO: shouldn't this be ! isInList ?
-        if (isInList(testPt, pts))
+        if (!isInList(testPt, pts))
             return testPt;
     }
     return Coordinate::getNull();
@@ -119,9 +118,9 @@ EdgeRing::isInList(const Coordinate& pt,
     for (std::size_t i = 0; i < npts; ++i)
     {
         if (pt == pts->getAt(i))
-            return false;
+            return true;
     }
-    return true;
+    return false;
 }
 
 /*public*/

-----------------------------------------------------------------------

Summary of changes:
 src/operation/polygonize/EdgeRing.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GEOS