[geos-commits] [SCM] GEOS branch master updated. 7e0d548fed76e75beb1c39b725f0b558d4a302e2

[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  7e0d548fed76e75beb1c39b725f0b558d4a302e2 (commit)
       via  629404d06b3dfcb9ba6e856f42a8a385bc67c62d (commit)
      from  92ec0d5198a1ec3fd7afdfa5569b51f8ddd741af (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 7e0d548fed76e75beb1c39b725f0b558d4a302e2
Merge: 92ec0d5 629404d
Author: Dan Baston <dbaston at gmail.com>
Date:   Thu Feb 13 10:11:13 2020 -0500

    Merge remote-tracking branch 'rouault/fix_clang9_wextra_warnings'


commit 629404d06b3dfcb9ba6e856f42a8a385bc67c62d
Author: Even Rouault <even.rouault at spatialys.com>
Date:   Thu Feb 13 01:41:51 2020 +0100

    Fix a few CLang 9 -Wextra warnings
    
    - Unused private member --> removed
    - Unused method (likely a debugging one) -> protected by #if GEOS_DEBUG
    - Unused variables in a destructor -> removed

diff --git a/include/geos/noding/NodingIntersectionFinder.h b/include/geos/noding/NodingIntersectionFinder.h
index a45f7c1..ebb6094 100644
--- a/include/geos/noding/NodingIntersectionFinder.h
+++ b/include/geos/noding/NodingIntersectionFinder.h
@@ -60,8 +60,7 @@ public:
         interiorIntersection(geom::Coordinate::getNull()),
         intersectionCount(0),
         isCheckEndSegmentsOnly(false),
-        findAllIntersections(false),
-        keepIntersections(true)
+        findAllIntersections(false)
     {
     }
 
@@ -168,7 +167,6 @@ private:
     size_t intersectionCount;
     bool isCheckEndSegmentsOnly;
     bool findAllIntersections;
-    bool keepIntersections;
     std::vector<geom::Coordinate> intSegments;
 
     // Declare type as noncopyable
diff --git a/src/noding/MCIndexSegmentSetMutualIntersector.cpp b/src/noding/MCIndexSegmentSetMutualIntersector.cpp
index e7b31c4..40580ef 100644
--- a/src/noding/MCIndexSegmentSetMutualIntersector.cpp
+++ b/src/noding/MCIndexSegmentSetMutualIntersector.cpp
@@ -105,8 +105,6 @@ MCIndexSegmentSetMutualIntersector::MCIndexSegmentSetMutualIntersector()
 MCIndexSegmentSetMutualIntersector::~MCIndexSegmentSetMutualIntersector()
 {
     delete index;
-
-    MonoChains::iterator i, e;
 }
 
 /* public */
diff --git a/src/operation/union/CascadedPolygonUnion.cpp b/src/operation/union/CascadedPolygonUnion.cpp
index d9bd493..f64564d 100644
--- a/src/operation/union/CascadedPolygonUnion.cpp
+++ b/src/operation/union/CascadedPolygonUnion.cpp
@@ -47,6 +47,7 @@
 
 namespace {
 
+#if GEOS_DEBUG
 inline bool
 check_valid(const geos::geom::Geometry& g, const std::string& label, bool doThrow = false, bool validOnly = false)
 {
@@ -92,6 +93,7 @@ check_valid(const geos::geom::Geometry& g, const std::string& label, bool doThro
     }
     return true;
 }
+#endif
 
 } // anonymous namespace
 

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

Summary of changes:
 include/geos/noding/NodingIntersectionFinder.h    | 4 +---
 src/noding/MCIndexSegmentSetMutualIntersector.cpp | 2 --
 src/operation/union/CascadedPolygonUnion.cpp      | 2 ++
 3 files changed, 3 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GEOS