[geos-commits] [SCM] GEOS branch master updated. 612b47ba9f81e64f317a01b86af31a1054cc0b3a

[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  612b47ba9f81e64f317a01b86af31a1054cc0b3a (commit)
      from  59c99cb7ee1d587ec8e5eb105529e0b9796277cb (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 612b47ba9f81e64f317a01b86af31a1054cc0b3a
Author: Martin Davis <mtnclimb at gmail.com>
Date:   Wed Jan 6 14:03:12 2021 -0800

    Fix some geosop warnings and build issues

diff --git a/util/geosop/GeosOp.cpp b/util/geosop/GeosOp.cpp
index f30bd24..00bccfa 100644
--- a/util/geosop/GeosOp.cpp
+++ b/util/geosop/GeosOp.cpp
@@ -436,7 +436,7 @@ void GeosOp::output(Result* result) {
 }
 
 void GeosOp::outputExplode(std::unique_ptr<Geometry>& geom) {
-    for (int i = 0; i < geom->getNumGeometries(); i++) {
+    for (size_t i = 0; i < geom->getNumGeometries(); i++) {
         auto g = geom->getGeometryN(i);
         outputGeometry( g );
     }
diff --git a/util/geosop/Makefile.am b/util/geosop/Makefile.am
index 7cff3e4..38bca5d 100644
--- a/util/geosop/Makefile.am
+++ b/util/geosop/Makefile.am
@@ -5,10 +5,9 @@ prefix=@prefix@
 top_srcdir=@top_srcdir@
 top_builddir=@top_builddir@
 
-noinst_PROGRAMS = \
-	GeosOp
+noinst_PROGRAMS = geosop
 
-GeosOp_SOURCES = \
+geosop_SOURCES = \
 	GeosOp.cpp \
 	GeosOp.h \
 	cxxopts.hpp \
@@ -19,7 +18,7 @@ GeosOp_SOURCES = \
 	WKTStreamReader.cpp \
 	WKTStreamReader.h
 
-GeosOp_LDADD = $(top_builddir)/src/libgeos.la
+geosop_LDADD = $(top_builddir)/src/libgeos.la
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
 

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

Summary of changes:
 util/geosop/GeosOp.cpp  | 2 +-
 util/geosop/Makefile.am | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GEOS