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

[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  b2e7efc30a979954bf7dfa8fb252473afcd509b8 (commit)
      from  d60a6649ab6a7db05798afc8f2032fecd0aaa8eb (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 b2e7efc30a979954bf7dfa8fb252473afcd509b8
Author: Daniel Baston <dbaston at gmail.com>
Date:   Thu Jan 28 23:20:44 2021 -0500

    Quiet more clang warnings

diff --git a/benchmarks/algorithm/InteriorPointAreaPerfTest.cpp b/benchmarks/algorithm/InteriorPointAreaPerfTest.cpp
index c5b25e2..df294fd 100644
--- a/benchmarks/algorithm/InteriorPointAreaPerfTest.cpp
+++ b/benchmarks/algorithm/InteriorPointAreaPerfTest.cpp
@@ -46,7 +46,7 @@ public:
     }
 
     void
-    test(int nPts)
+    test(uint32_t nPts)
     {
         Coordinate origin(ORG_X, ORG_Y);
         std::unique_ptr<geos::geom::Polygon> sinePoly =
@@ -108,7 +108,7 @@ private:
 
     std::unique_ptr<geos::geom::Polygon>
     createSineStar(const Coordinate& origin,
-                   double size, int nPts)
+                   double size, uint32_t nPts)
     {
         using geos::geom::util::SineStarFactory;
 
diff --git a/benchmarks/operation/predicate/RectangleIntersectsPerfTest.cpp b/benchmarks/operation/predicate/RectangleIntersectsPerfTest.cpp
index fddcd17..a0ec8c1 100644
--- a/benchmarks/operation/predicate/RectangleIntersectsPerfTest.cpp
+++ b/benchmarks/operation/predicate/RectangleIntersectsPerfTest.cpp
@@ -43,7 +43,7 @@ public:
     {}
 
     void
-    test(int nPts)
+    test(uint32_t nPts)
     {
         double size = 100;
         Coordinate origin(0, 0);
@@ -130,7 +130,7 @@ private:
 
     Polygon::Ptr
     createSineStar(const Coordinate& origin,
-                   double size, int nPts)
+                   double size, uint32_t nPts)
     {
         using geos::geom::util::SineStarFactory;
 
diff --git a/tests/unit/noding/NodedSegmentStringTest.cpp b/tests/unit/noding/NodedSegmentStringTest.cpp
index 12e4ada..630cb12 100644
--- a/tests/unit/noding/NodedSegmentStringTest.cpp
+++ b/tests/unit/noding/NodedSegmentStringTest.cpp
@@ -63,7 +63,7 @@ struct test_nodedsegmentstring_data {
     }
 
     void
-    checkNoding(const std::string& wktLine, const std::string& wktNodes, std::vector<int> segmentIndex, const std::string& wktExpected)
+    checkNoding(const std::string& wktLine, const std::string& wktNodes, std::vector<size_t> segmentIndex, const std::string& wktExpected)
     {
         using geos::noding::NodedSegmentString;
 
@@ -115,7 +115,7 @@ template<>
 void object::test<1>
 ()
 {
-    auto cs = geos::detail::make_unique<geos::geom::CoordinateArraySequence>(0, 2);
+    auto cs = geos::detail::make_unique<geos::geom::CoordinateArraySequence>(0u, 2u);
 
     ensure(nullptr != cs.get());
 
@@ -151,7 +151,7 @@ template<>
 void object::test<2>
 ()
 {
-    auto cs = geos::detail::make_unique<geos::geom::CoordinateArraySequence>(0, 2);
+    auto cs = geos::detail::make_unique<geos::geom::CoordinateArraySequence>(0u, 2u);
 
     ensure(nullptr != cs.get());
 
@@ -187,7 +187,7 @@ template<>
 void object::test<3>
 ()
 {
-    auto cs = geos::detail::make_unique<geos::geom::CoordinateArraySequence>(0, 2);
+    auto cs = geos::detail::make_unique<geos::geom::CoordinateArraySequence>(0u, 2u);
 
     ensure(nullptr != cs.get());
 
@@ -260,7 +260,7 @@ void object::test<5>
     geos::geom::Coordinate p1(10, 0);
 
 
-    auto cs = geos::detail::make_unique<geos::geom::CoordinateArraySequence>(0, 2);
+    auto cs = geos::detail::make_unique<geos::geom::CoordinateArraySequence>(0u, 2u);
     cs->add(p0);
     cs->add(p1);
 
@@ -302,7 +302,7 @@ template<>
 void object::test<6>
 ()
 {
-    std::vector<int> segmentIndex;
+    std::vector<size_t> segmentIndex;
     segmentIndex.push_back(0);
     segmentIndex.push_back(0);
     segmentIndex.push_back(1);
diff --git a/tests/unit/operation/distance/IndexedFacetDistanceTest.cpp b/tests/unit/operation/distance/IndexedFacetDistanceTest.cpp
index de93d1b..b5bc8de 100644
--- a/tests/unit/operation/distance/IndexedFacetDistanceTest.cpp
+++ b/tests/unit/operation/distance/IndexedFacetDistanceTest.cpp
@@ -270,7 +270,7 @@ template<>
 void object::test<10>
 ()
 {
-    int npoints = 1000; // vertices in sinstar test shape
+    std::size_t npoints = 1000; // vertices in sinstar test shape
     int ncells = 100; // number of columns/rows in test grid square
 
     double radius = 100.0;
@@ -309,7 +309,7 @@ void object::test<10>
                                          "TestBoth"};
 
     bool perfTest = false;
-    std::vector<int> m = {TestBoth};
+    std::vector<size_t> m = {TestBoth};
     if (perfTest) {
         m.push_back(TestIndexedFacetDistance);
         m.push_back(TestGeometryDistance);

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

Summary of changes:
 benchmarks/algorithm/InteriorPointAreaPerfTest.cpp           |  4 ++--
 .../operation/predicate/RectangleIntersectsPerfTest.cpp      |  4 ++--
 tests/unit/noding/NodedSegmentStringTest.cpp                 | 12 ++++++------
 tests/unit/operation/distance/IndexedFacetDistanceTest.cpp   |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
GEOS