[geos-commits] [SCM] GEOS branch master updated. 23f7bbd3dd3558b17432402429f1cfb8ec0b7bf1

[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  23f7bbd3dd3558b17432402429f1cfb8ec0b7bf1 (commit)
       via  3fb13aa761df6898fc992318d031537b137a5451 (commit)
       via  5b5763569f3e3f77f097ad2a40a2a610ea389bd3 (commit)
      from  e1982464794e489eccd5732d23ad19da6f054a6c (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 23f7bbd3dd3558b17432402429f1cfb8ec0b7bf1
Author: Even Rouault <even.rouault at spatialys.com>
Date:   Fri Oct 2 10:52:54 2020 +0200

    HotPixel.cpp: fix -Wreorder warning

diff --git a/src/noding/snapround/HotPixel.cpp b/src/noding/snapround/HotPixel.cpp
index bddafcd..0ba6d34 100644
--- a/src/noding/snapround/HotPixel.cpp
+++ b/src/noding/snapround/HotPixel.cpp
@@ -41,8 +41,8 @@ namespace snapround { // geos.noding.snapround
 
 HotPixel::HotPixel(const Coordinate& newPt, double newScaleFactor)
     : originalPt(newPt)
-    , hpIsNode(false)
     , scaleFactor(newScaleFactor)
+    , hpIsNode(false)
     , hpx(newPt.x)
     , hpy(newPt.y)
 {

commit 3fb13aa761df6898fc992318d031537b137a5451
Author: Even Rouault <even.rouault at spatialys.com>
Date:   Fri Oct 2 10:52:34 2020 +0200

    KdTree.cpp: remove useless duplicated condition

diff --git a/src/index/kdtree/KdTree.cpp b/src/index/kdtree/KdTree.cpp
index f2891fb..c36fbce 100644
--- a/src/index/kdtree/KdTree.cpp
+++ b/src/index/kdtree/KdTree.cpp
@@ -112,15 +112,13 @@ KdTree::insertExact(const geom::Coordinate& p, void* data)
 
     while (currentNode != nullptr) {
         // test if point is already a node (not strictly necessary)
-        if (currentNode != nullptr) {
-            bool isInTolerance = p.distance(currentNode->getCoordinate()) <= tolerance;
-
-            // check if point is already in tree (up to tolerance) and if so simply
-            // return existing node
-            if (isInTolerance) {
-                currentNode->increment();
-                return currentNode;
-            }
+        bool isInTolerance = p.distance(currentNode->getCoordinate()) <= tolerance;
+
+        // check if point is already in tree (up to tolerance) and if so simply
+        // return existing node
+        if (isInTolerance) {
+            currentNode->increment();
+            return currentNode;
         }
 
         if (isOddLevel) {

commit 5b5763569f3e3f77f097ad2a40a2a610ea389bd3
Author: Even Rouault <even.rouault at spatialys.com>
Date:   Fri Oct 2 10:52:16 2020 +0200

    EdgeList.cpp: *(&foo)) is equivalent to foo

diff --git a/src/geomgraph/EdgeList.cpp b/src/geomgraph/EdgeList.cpp
index f865a86..534342a 100644
--- a/src/geomgraph/EdgeList.cpp
+++ b/src/geomgraph/EdgeList.cpp
@@ -129,7 +129,7 @@ void
 EdgeList::clearList()
 {
     for(unsigned int pos = 0; pos < edges.size(); pos++) {
-        delete *(&edges[pos]);
+        delete edges[pos];
     }
 
     edges.clear();

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

Summary of changes:
 src/geomgraph/EdgeList.cpp        |  2 +-
 src/index/kdtree/KdTree.cpp       | 16 +++++++---------
 src/noding/snapround/HotPixel.cpp |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GEOS