[geos-commits] [SCM] GEOS branch master updated. 8ae842b332c6d199ceeed7792a85b3d84a0baa45

[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  8ae842b332c6d199ceeed7792a85b3d84a0baa45 (commit)
       via  82d31f0fb77e8ea825de6c403f8eacf23d9f8cf7 (commit)
      from  da2fb44ee0680811c971689ae0f60fe9187b42ae (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 8ae842b332c6d199ceeed7792a85b3d84a0baa45
Merge: da2fb44 82d31f0
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Sep 1 20:18:06 2020 -0700

    Merge branch 'otan-cockroach-fix_warn'


commit 82d31f0fb77e8ea825de6c403f8eacf23d9f8cf7
Author: Oliver Tan <otan at cockroachlabs.com>
Date:   Tue Sep 1 19:02:22 2020 -0700

    WKBWriter: fix -Wsign-conversion compilation error

diff --git a/src/io/WKBWriter.cpp b/src/io/WKBWriter.cpp
index 37babfd..061e6ed 100644
--- a/src/io/WKBWriter.cpp
+++ b/src/io/WKBWriter.cpp
@@ -129,7 +129,7 @@ WKBWriter::writePointEmpty(const Point& g)
     writeSRID(g.getSRID());
 
     Coordinate c(DoubleNotANumber, DoubleNotANumber, DoubleNotANumber);
-    CoordinateArraySequence cas(std::size_t(1), g.getCoordinateDimension());
+    CoordinateArraySequence cas(std::size_t(1), std::size_t(g.getCoordinateDimension()));
     cas.setAt(c, 0);
 
     writeCoordinateSequence(cas, false);
@@ -256,7 +256,7 @@ WKBWriter::setByteOrder(int bo)
 void
 WKBWriter::writeGeometryType(int typeId, int SRID)
 {
-    int flag3D = (outputDimension == 3) ? 0x80000000 : 0;
+    int flag3D = (outputDimension == 3) ? int(0x80000000) : 0;
     int typeInt = typeId | flag3D;
 
     if(includeSRID && SRID != 0) {

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

Summary of changes:
 src/io/WKBWriter.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GEOS