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

[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  6fcdaeebc7ed507ef03dd6b1cc923cca4c50b70b (commit)
       via  e77d7df343d006a86e23602813bab9f52129e95c (commit)
       via  4c38ed7bfcb79e2266441823fa460e657f1e41ed (commit)
       via  78577f4c3b0a8389c24e7dbdf098c1de679f52a6 (commit)
      from  85b2d372728d9cd82fe49fde3326fd0213f1fd14 (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 6fcdaeebc7ed507ef03dd6b1cc923cca4c50b70b
Merge: 85b2d37 e77d7df
Author: mdavis <mtnclimb at gmail.com>
Date:   Fri Feb 22 11:35:48 2019 -0800

    Merge branch 'InteriorPointAreaPerfTest_fixes' of rouault/geos into master


commit e77d7df343d006a86e23602813bab9f52129e95c
Author: Even Rouault <even.rouault at spatialys.com>
Date:   Fri Feb 22 14:36:24 2019 +0100

    tools/astyle/Makefile.am: fixes so that the .tar.gz generated by 'make dist' can be built with cmake

diff --git a/tools/astyle/Makefile.am b/tools/astyle/Makefile.am
index d582267..432eb11 100644
--- a/tools/astyle/Makefile.am
+++ b/tools/astyle/Makefile.am
@@ -7,9 +7,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CPPFLAGS =
 
 EXTRA_DIST = \
-	ASLocalizer.h \
-	astyle.h \
-	astyle_main.h
+	CMakeLists.txt
 
 noinst_PROGRAMS = astyle
 #check_PROGRAMS =
@@ -24,4 +22,7 @@ astyle_SOURCES = \
 	astyle_main.cpp
 
 
-noinst_HEADERS =
+noinst_HEADERS = \
+	ASLocalizer.h \
+	astyle.h \
+	astyle_main.h

commit 4c38ed7bfcb79e2266441823fa460e657f1e41ed
Author: Even Rouault <even.rouault at spatialys.com>
Date:   Fri Feb 22 14:28:50 2019 +0100

    Integrate InteriorPointAreaPerfTest.cpp in autoconf builds (fixes #957)

diff --git a/configure.ac b/configure.ac
index 3852b64..8a6981a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -493,6 +493,7 @@ AC_OUTPUT([
 	tests/bigtest/Makefile
 	tests/unit/Makefile
 	tests/perf/Makefile
+	tests/perf/algorithm/Makefile
 	tests/perf/operation/Makefile
 	tests/perf/operation/buffer/Makefile
 	tests/perf/operation/predicate/Makefile
diff --git a/tests/perf/Makefile.am b/tests/perf/Makefile.am
index f3a0546..82f124d 100644
--- a/tests/perf/Makefile.am
+++ b/tests/perf/Makefile.am
@@ -2,6 +2,7 @@
 # This file is part of project GEOS (http://trac.osgeo.org/geos/)
 #
 SUBDIRS = \
+	algorithm \
 	operation \
 	capi
 

commit 78577f4c3b0a8389c24e7dbdf098c1de679f52a6
Author: Even Rouault <even.rouault at spatialys.com>
Date:   Fri Feb 22 14:28:22 2019 +0100

    InteriorPointAreaPerfTest.cpp: fix MSVC build (fixes #957)

diff --git a/tests/perf/algorithm/InteriorPointAreaPerfTest.cpp b/tests/perf/algorithm/InteriorPointAreaPerfTest.cpp
index 9ff3913..9d47ba1 100644
--- a/tests/perf/algorithm/InteriorPointAreaPerfTest.cpp
+++ b/tests/perf/algorithm/InteriorPointAreaPerfTest.cpp
@@ -50,7 +50,7 @@ public:
     test(int nPts)
     {
         Coordinate origin(ORG_X, ORG_Y);
-        std::unique_ptr<Polygon> sinePoly =
+        std::unique_ptr<geos::geom::Polygon> sinePoly =
             createSineStar(origin, SIZE, nPts);
 
         /**
@@ -96,8 +96,6 @@ private:
     void
     test(geos::geom::Geometry& poly)
     {
-        typedef vector<const Geometry*>::size_type size_type;
-
         geos::util::Profile sw("");
         sw.start();
 
@@ -109,7 +107,7 @@ private:
         cout << poly.getNumPoints() << " points: " << sw.getTotFormatted() << endl;
     }
 
-    std::unique_ptr<Polygon>
+    std::unique_ptr<geos::geom::Polygon>
     createSineStar(const Coordinate& origin,
                    double size, int nPts)
     {
@@ -121,7 +119,7 @@ private:
         gsf.setNumPoints(nPts);
         gsf.setArmLengthRatio( ARM_RATIO );
         gsf.setNumArms( N_ARMS );
-        std::unique_ptr<Polygon> poly = gsf.createSineStar();
+        std::unique_ptr<geos::geom::Polygon> poly = gsf.createSineStar();
         return poly;
     }
 };

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

Summary of changes:
 configure.ac                                       | 1 +
 tests/perf/Makefile.am                             | 1 +
 tests/perf/algorithm/InteriorPointAreaPerfTest.cpp | 8 +++-----
 tools/astyle/Makefile.am                           | 9 +++++----
 4 files changed, 10 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GEOS