[geos-commits] [SCM] GEOS branch master updated. 6aa82e1d46f512172c648c5f00a4b5d8cf494f69

[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  6aa82e1d46f512172c648c5f00a4b5d8cf494f69 (commit)
       via  bd8021e70d1cadac8de46af20979fdd577c99908 (commit)
       via  cf93d80221e4bcdc753468eab0ff5ae7e6666fa9 (commit)
      from  2d95d1a35053cfd602eaa22248d69a196ef71ccf (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 6aa82e1d46f512172c648c5f00a4b5d8cf494f69
Merge: 2d95d1a bd8021e
Author: Daniel Baston <dbaston at gmail.com>
Date:   Sun Dec 20 15:42:39 2020 -0500

    Merge remote-tracking branch 'rouault/cppcheck_fixes'


commit bd8021e70d1cadac8de46af20979fdd577c99908
Author: Even Rouault <even.rouault at spatialys.com>
Date:   Sat Dec 19 13:47:35 2020 +0100

    Fix "Variable 'xx' is reassigned a value before the old one has been used" type of warnings

diff --git a/src/geom/LineSegment.cpp b/src/geom/LineSegment.cpp
index bba2a45..c798f66 100644
--- a/src/geom/LineSegment.cpp
+++ b/src/geom/LineSegment.cpp
@@ -199,12 +199,11 @@ LineSegment::closestPoints(const LineSegment& line)
      */
     std::array<Coordinate, 2> closestPt;
 
-    double minDistance = DoubleMax;
     double dist;
 
     Coordinate close00;
     closestPoint(line.p0, close00);
-    minDistance = close00.distance(line.p0);
+    double minDistance = close00.distance(line.p0);
 
     closestPt[0] = close00;
     closestPt[1] = line.p0;
diff --git a/src/geomgraph/Node.cpp b/src/geomgraph/Node.cpp
index bafa21a..7b0214e 100644
--- a/src/geomgraph/Node.cpp
+++ b/src/geomgraph/Node.cpp
@@ -224,8 +224,7 @@ Node::setLabelBoundary(int argIndex)
 Location
 Node::computeMergedLocation(const Label& label2, int eltIndex)
 {
-    Location loc = Location::NONE;
-    loc = label.getLocation(eltIndex);
+    Location loc = label.getLocation(eltIndex);
     if(!label2.isNull(eltIndex)) {
         Location nLoc = label2.getLocation(eltIndex);
         if(loc != Location::BOUNDARY) {

commit cf93d80221e4bcdc753468eab0ff5ae7e6666fa9
Author: Even Rouault <even.rouault at spatialys.com>
Date:   Sat Dec 19 13:46:12 2020 +0100

    Mark methods as static

diff --git a/src/algorithm/ConvexHull.cpp b/src/algorithm/ConvexHull.cpp
index 52df7fd..3701913 100644
--- a/src/algorithm/ConvexHull.cpp
+++ b/src/algorithm/ConvexHull.cpp
@@ -54,7 +54,7 @@ private:
 
     const Coordinate* origin;
 
-    int
+    static int
     polarCompare(const Coordinate* o, const Coordinate* p,
                  const Coordinate* q)
     {
diff --git a/src/algorithm/InteriorPointArea.cpp b/src/algorithm/InteriorPointArea.cpp
index 308c3d0..07aba5b 100644
--- a/src/algorithm/InteriorPointArea.cpp
+++ b/src/algorithm/InteriorPointArea.cpp
@@ -188,7 +188,7 @@ private:
         }
     }
 
-    void addEdgeCrossing(const Coordinate& p0, const Coordinate& p1, double scanY, std::vector<double>& crossings)
+    static void addEdgeCrossing(const Coordinate& p0, const Coordinate& p1, double scanY, std::vector<double>& crossings)
     {
         // skip non-crossing segments
         if (!intersectsHorizontalLine(p0, p1, scanY))

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

Summary of changes:
 src/algorithm/ConvexHull.cpp        | 2 +-
 src/algorithm/InteriorPointArea.cpp | 2 +-
 src/geom/LineSegment.cpp            | 3 +--
 src/geomgraph/Node.cpp              | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GEOS