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

[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  f98133f91f4125b5a540386784d79c9d31ffca16 (commit)
       via  da2c3645be5cf8c561e0525a20f5033588551fb8 (commit)
      from  b15fd1171823d16195bee17f2c7b44778603258d (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 f98133f91f4125b5a540386784d79c9d31ffca16
Author: Daniel Baston <dbaston at gmail.com>
Date:   Sat May 18 22:12:59 2019 -0400

    Fix warnings in FacetSequence

diff --git a/include/geos/operation/distance/FacetSequence.h b/include/geos/operation/distance/FacetSequence.h
index 7953db3..dc609a1 100644
--- a/include/geos/operation/distance/FacetSequence.h
+++ b/include/geos/operation/distance/FacetSequence.h
@@ -49,13 +49,13 @@ private:
                                     std::vector<GeometryLocation> *locs) const;
 
     void updateNearestLocationsPointLine(const geom::Coordinate& pt,
-                                         const FacetSequence& facetSeq, int i,
+                                         const FacetSequence& facetSeq, size_t i,
                                          const geom::Coordinate& q0, const geom::Coordinate &q1,
                                          std::vector<GeometryLocation> *locs) const;
 
-    void updateNearestLocationsLineLine(int i, const geom::Coordinate& p0, const geom::Coordinate& p1,
+    void updateNearestLocationsLineLine(size_t i, const geom::Coordinate& p0, const geom::Coordinate& p1,
                                         const FacetSequence& facetSeq,
-                                        int j, const geom::Coordinate& q0, const geom::Coordinate &q1,
+                                        size_t j, const geom::Coordinate& q0, const geom::Coordinate &q1,
                                         std::vector<GeometryLocation> *locs) const;
 
     void computeEnvelope();
diff --git a/src/operation/distance/FacetSequence.cpp b/src/operation/distance/FacetSequence.cpp
index 1a9e0ac..a948cc7 100644
--- a/src/operation/distance/FacetSequence.cpp
+++ b/src/operation/distance/FacetSequence.cpp
@@ -26,19 +26,19 @@ using namespace geos::operation::distance;
 using namespace geos::algorithm;
 
 FacetSequence::FacetSequence(const Geometry *p_geom, const CoordinateSequence* p_pts, size_t p_start, size_t p_end) :
-    geom(p_geom),
     pts(p_pts),
     start(p_start),
-    end(p_end)
+    end(p_end),
+    geom(p_geom)
 {
     computeEnvelope();
 }
 
 FacetSequence::FacetSequence(const CoordinateSequence* p_pts, size_t p_start, size_t p_end) :
-    geom(nullptr),
     pts(p_pts),
     start(p_start),
-    end(p_end)
+    end(p_end),
+    geom(nullptr)
 {
     computeEnvelope();
 }
@@ -151,7 +151,7 @@ FacetSequence::computeDistancePointLine(const Coordinate& pt,
 
 void
 FacetSequence::updateNearestLocationsPointLine(const Coordinate& pt,
-        const FacetSequence& facetSeq, int i,
+        const FacetSequence& facetSeq, size_t i,
         const Coordinate& q0, const Coordinate &q1,
         std::vector<GeometryLocation> *locs) const
 {
@@ -196,9 +196,9 @@ FacetSequence::computeDistanceLineLine(const FacetSequence& facetSeq, std::vecto
 }
 
 void
-FacetSequence::updateNearestLocationsLineLine(int i, const Coordinate& p0, const Coordinate& p1,
+FacetSequence::updateNearestLocationsLineLine(size_t i, const Coordinate& p0, const Coordinate& p1,
         const FacetSequence& facetSeq,
-        int j, const Coordinate& q0, const Coordinate &q1,
+        size_t j, const Coordinate& q0, const Coordinate &q1,
         std::vector<GeometryLocation> *locs) const
 {
     LineSegment seg0(p0, p1);

commit da2c3645be5cf8c561e0525a20f5033588551fb8
Author: Daniel Baston <dbaston at gmail.com>
Date:   Sat May 18 22:02:32 2019 -0400

    Switch Travis builds to xenial

diff --git a/.travis.yml b/.travis.yml
index 7f6d5b0..77f2a46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@
 # by the Free Software Foundation.
 # See the COPYING file for more information.
 #
-dist: trusty
+dist: xenial
 sudo: false
 
 language: cpp

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

Summary of changes:
 .travis.yml                                     |  2 +-
 include/geos/operation/distance/FacetSequence.h |  6 +++---
 src/operation/distance/FacetSequence.cpp        | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GEOS