[geos-commits] [SCM] GEOS branch master updated. 562bcb28e8b8f8683b5dc8e61347eacaab3e038e
git at osgeo.org
git at osgeo.org
Thu Feb 25 17:24:40 PST 2021
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 562bcb28e8b8f8683b5dc8e61347eacaab3e038e (commit)
via d76be17256f7f567b0744e955265c6390822b263 (commit)
via c4c64d206c6315c36720526f35e7b46bcc6d736e (commit)
via e3a5e774b860a518179e0869ab2fbeaa49d85714 (commit)
via 57bcd6101bd4691c64a772fd2011ef32fa02fa78 (commit)
via 03f765d4388af43ce37440c2804e83a9d379964b (commit)
from 33e37716b99f02aa2ca079857e408e5d5882e307 (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 562bcb28e8b8f8683b5dc8e61347eacaab3e038e
Author: Daniel Baston <dbaston at gmail.com>
Date: Wed Feb 24 10:39:51 2021 -0500
Clear gcc warning in RobustLineIntersectorZTest
diff --git a/tests/unit/algorithm/RobustLineIntersectorZTest.cpp b/tests/unit/algorithm/RobustLineIntersectorZTest.cpp
index baf378d..a99a8f0 100644
--- a/tests/unit/algorithm/RobustLineIntersectorZTest.cpp
+++ b/tests/unit/algorithm/RobustLineIntersectorZTest.cpp
@@ -68,20 +68,20 @@ struct test_robustlineintersectorz_data {
void checkIntersection(
const LineSegment& line1,
const LineSegment& line2,
- const Coordinate& pt)
+ const Coordinate& p_pt)
{
- checkIntersectionDir(line1, line2, pt);
- checkIntersectionDir(line2, line1, pt);
+ checkIntersectionDir(line1, line2, p_pt);
+ checkIntersectionDir(line2, line1, p_pt);
LineSegment line1Rev(line1.p1, line1.p0);
LineSegment line2Rev(line2.p1, line2.p0);
- checkIntersectionDir(line1Rev, line2Rev, pt);
- checkIntersectionDir(line2Rev, line1Rev, pt);
+ checkIntersectionDir(line1Rev, line2Rev, p_pt);
+ checkIntersectionDir(line2Rev, line1Rev, p_pt);
}
void checkIntersectionDir(
const LineSegment& line1,
const LineSegment& line2,
- const Coordinate& pt)
+ const Coordinate& p_pt)
{
RobustLineIntersector li;
li.computeIntersection(
@@ -89,7 +89,7 @@ struct test_robustlineintersectorz_data {
line2.p0, line2.p1);
ensure_equals(li.getIntersectionNum(), 1u);
Coordinate actual = li.getIntersection(0);
- ensure_equals_xyz( actual, pt );
+ ensure_equals_xyz( actual, p_pt );
}
static Coordinate pt(double x, double y, double z) {
commit d76be17256f7f567b0744e955265c6390822b263
Author: Daniel Baston <dbaston at gmail.com>
Date: Wed Feb 24 09:32:52 2021 -0500
Ignore warning options not supported by compiler
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f86949..e6ec423 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,7 +240,7 @@ target_compile_definitions(geos_developer_cxx_flags
target_compile_options(geos_developer_cxx_flags
INTERFACE
$<$<CXX_COMPILER_ID:MSVC>:-W4>
- $<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Werror -pedantic -Wall -Wextra -Wno-long-long -Wcast-align -Wconversion -Wchar-subscripts -Wdouble-promotion -Wpointer-arith -Wformat -Wformat-security -Wshadow -Wuninitialized -Wunused-parameter -fno-common>
+ $<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Werror -Wno-unknown-warning-option -pedantic -Wall -Wextra -Wno-long-long -Wcast-align -Wconversion -Wchar-subscripts -Wdouble-promotion -Wpointer-arith -Wformat -Wformat-security -Wshadow -Wuninitialized -Wunused-parameter -fno-common>
$<$<CXX_COMPILER_ID:GNU>:-fno-implicit-inline-templates>)
#-----------------------------------------------------------------------------
commit c4c64d206c6315c36720526f35e7b46bcc6d736e
Author: Daniel Baston <dbaston at gmail.com>
Date: Wed Feb 24 09:30:38 2021 -0500
Clear WKBReader shadow warning
diff --git a/src/io/WKBReader.cpp b/src/io/WKBReader.cpp
index ee0ad3d..8bcb8b2 100644
--- a/src/io/WKBReader.cpp
+++ b/src/io/WKBReader.cpp
@@ -173,7 +173,7 @@ WKBReader::readHEX(std::istream& is)
void
WKBReader::minMemSize(int geomType, uint64_t size)
{
- uint64_t minMemSize = 0;
+ uint64_t minSize = 0;
constexpr uint64_t minCoordSize = 2 * sizeof(double);
constexpr uint64_t minPtSize = (1+4) + minCoordSize;
constexpr uint64_t minLineSize = (1+4+4); // empty line
@@ -184,26 +184,26 @@ WKBReader::minMemSize(int geomType, uint64_t size)
switch(geomType) {
case GEOS_LINESTRING:
case GEOS_LINEARRING:
- minMemSize = size * minCoordSize;
+ minSize = size * minCoordSize;
break;
case GEOS_POLYGON:
- minMemSize = size * minRingSize;
+ minSize = size * minRingSize;
break;
case GEOS_MULTIPOINT:
- minMemSize = size * minPtSize;
+ minSize = size * minPtSize;
break;
case GEOS_MULTILINESTRING:
- minMemSize = size * minLineSize;
+ minSize = size * minLineSize;
break;
case GEOS_MULTIPOLYGON:
- minMemSize = size * minPolySize;
+ minSize = size * minPolySize;
break;
case GEOS_GEOMETRYCOLLECTION:
- minMemSize = size * minGeomSize;
+ minSize = size * minGeomSize;
break;
}
- if (dis.size() < minMemSize) {
+ if (dis.size() < minSize) {
throw ParseException("Input buffer is smaller than requested object size");
}
}
commit e3a5e774b860a518179e0869ab2fbeaa49d85714
Author: Daniel Baston <dbaston at gmail.com>
Date: Tue Feb 23 23:04:16 2021 -0500
Fix gcc warnings in geosop
diff --git a/util/geosop/GeosOp.cpp b/util/geosop/GeosOp.cpp
index fcefbbf..2cd4844 100644
--- a/util/geosop/GeosOp.cpp
+++ b/util/geosop/GeosOp.cpp
@@ -277,7 +277,7 @@ std::string summaryStats(std::vector<std::unique_ptr<Geometry>>& geoms) {
int geomPts = 0;
for (const auto& geom : geoms) {
geomCount++;
- geomPts += geom->getNumPoints();
+ geomPts += static_cast<int>(geom->getNumPoints());
}
return geomStats(geomCount, geomPts);
}
@@ -388,7 +388,7 @@ Result* GeosOp::executeOpRepeat(GeomFunction * fun,
unsigned int indexB,
const std::unique_ptr<Geometry>& gB)
{
- Result * res;
+ Result* res = nullptr;
for (int i = 0; i < args.repeatNum; i++) {
res = executeOp(fun, indexA, gA, indexB, gB);
}
diff --git a/util/geosop/WKBStreamReader.cpp b/util/geosop/WKBStreamReader.cpp
index d55ee7d..52fc9ea 100644
--- a/util/geosop/WKBStreamReader.cpp
+++ b/util/geosop/WKBStreamReader.cpp
@@ -24,8 +24,8 @@
using namespace geos::geom;
-WKBStreamReader::WKBStreamReader(std::istream& instr)
- : instr(instr)
+WKBStreamReader::WKBStreamReader(std::istream& p_instr)
+ : instr(p_instr)
{
}
diff --git a/util/geosop/WKTStreamReader.cpp b/util/geosop/WKTStreamReader.cpp
index 05123ba..4649d44 100644
--- a/util/geosop/WKTStreamReader.cpp
+++ b/util/geosop/WKTStreamReader.cpp
@@ -24,8 +24,8 @@
using namespace geos::geom;
-WKTStreamReader::WKTStreamReader(std::istream& instr)
- : instr(instr)
+WKTStreamReader::WKTStreamReader(std::istream& p_instr)
+ : instr(p_instr)
{
}
@@ -44,8 +44,8 @@ WKTStreamReader::next()
{
std::string wkt = "";
- int lParen = 0;
- int rParen = 0;
+ std::string::difference_type lParen = 0;
+ std::string::difference_type rParen = 0;
do {
std::string line;
std::getline(instr, line);
commit 57bcd6101bd4691c64a772fd2011ef32fa02fa78
Author: Daniel Baston <dbaston at gmail.com>
Date: Tue Feb 23 22:41:33 2021 -0500
Clear warnings in WKBReader
diff --git a/src/io/WKBReader.cpp b/src/io/WKBReader.cpp
index 1a57ca0..ee0ad3d 100644
--- a/src/io/WKBReader.cpp
+++ b/src/io/WKBReader.cpp
@@ -217,7 +217,7 @@ WKBReader::read(std::istream& is)
is.seekg(0, std::ios::beg);
std::vector<unsigned char> buf(static_cast<size_t>(size));
- is.read((char*) buf.data(), size);
+ is.read((char*) buf.data(), static_cast<std::streamsize>(size));
return read(buf.data(), buf.size());
}
commit 03f765d4388af43ce37440c2804e83a9d379964b
Author: Daniel Baston <dbaston at gmail.com>
Date: Tue Feb 23 22:33:00 2021 -0500
Add -Werror to developer build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1f3a29..2f86949 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,7 +240,7 @@ target_compile_definitions(geos_developer_cxx_flags
target_compile_options(geos_developer_cxx_flags
INTERFACE
$<$<CXX_COMPILER_ID:MSVC>:-W4>
- $<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-pedantic -Wall -Wextra -Wno-long-long -Wcast-align -Wconversion -Wchar-subscripts -Wdouble-promotion -Wpointer-arith -Wformat -Wformat-security -Wshadow -Wuninitialized -Wunused-parameter -fno-common>
+ $<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Werror -pedantic -Wall -Wextra -Wno-long-long -Wcast-align -Wconversion -Wchar-subscripts -Wdouble-promotion -Wpointer-arith -Wformat -Wformat-security -Wshadow -Wuninitialized -Wunused-parameter -fno-common>
$<$<CXX_COMPILER_ID:GNU>:-fno-implicit-inline-templates>)
#-----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 2 +-
src/io/WKBReader.cpp | 18 +++++++++---------
tests/unit/algorithm/RobustLineIntersectorZTest.cpp | 14 +++++++-------
util/geosop/GeosOp.cpp | 4 ++--
util/geosop/WKBStreamReader.cpp | 4 ++--
util/geosop/WKTStreamReader.cpp | 8 ++++----
6 files changed, 25 insertions(+), 25 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list