[geos-commits] [SCM] GEOS branch master updated. 0fc01f50865069e17557d45112c8c361db8e89b4
git at osgeo.org
git at osgeo.org
Fri Nov 27 11:01:39 PST 2020
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 0fc01f50865069e17557d45112c8c361db8e89b4 (commit)
from 3e37b5caf7a83318ee1483460d14028e3eec4e40 (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 0fc01f50865069e17557d45112c8c361db8e89b4
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Fri Nov 27 10:42:57 2020 -0800
Quiet compiler warnings (clang macos)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbbf153..0a9c32f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,6 @@ else()
message(STATUS "GEOS: Build type: ${CMAKE_BUILD_TYPE}")
endif()
-
#-----------------------------------------------------------------------------
# Options
#-----------------------------------------------------------------------------
@@ -213,12 +212,6 @@ target_compile_options(geos_developer_cxx_flags
$<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>>:-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>)
-# Disable TTMath ASM support on Windows due to build issues
-if(WIN32)
- target_compile_definitions(geos_cxx_flags
- INTERFACE TTMATH_NOASM)
-endif()
-
#-----------------------------------------------------------------------------
# Define a coverage build
#-----------------------------------------------------------------------------
diff --git a/capi/geos_ts_c.cpp b/capi/geos_ts_c.cpp
index 6bf1240..cbc94a8 100644
--- a/capi/geos_ts_c.cpp
+++ b/capi/geos_ts_c.cpp
@@ -113,10 +113,10 @@
#define GEOSCoordSequence geos::geom::CoordinateSequence
#define GEOSBufferParams geos::operation::buffer::BufferParameters
#define GEOSSTRtree geos::index::strtree::SimpleSTRtree
-#define GEOSWKTReader_t geos::io::WKTReader
-#define GEOSWKTWriter_t geos::io::WKTWriter
-#define GEOSWKBReader_t geos::io::WKBReader
-#define GEOSWKBWriter_t geos::io::WKBWriter
+#define GEOSWKTReader geos::io::WKTReader
+#define GEOSWKTWriter geos::io::WKTWriter
+#define GEOSWKBReader geos::io::WKBReader
+#define GEOSWKBWriter geos::io::WKBWriter
#include "geos_c.h"
@@ -2494,7 +2494,7 @@ extern "C" {
GEOSGeom_getCoordinateDimension_r(GEOSContextHandle_t extHandle, const Geometry* g)
{
return execute(extHandle, 0, [&]() {
- return g->getCoordinateDimension();
+ return (int)(g->getCoordinateDimension());
});
}
diff --git a/include/geos/algorithm/LineIntersector.h b/include/geos/algorithm/LineIntersector.h
index 2ac07fe..b9b9c03 100644
--- a/include/geos/algorithm/LineIntersector.h
+++ b/include/geos/algorithm/LineIntersector.h
@@ -103,7 +103,7 @@ public:
* @return <code>true</code> if either intersection point is in
* the interior of the input segment
*/
- bool isInteriorIntersection(int inputLineIndex);
+ bool isInteriorIntersection(size_t inputLineIndex);
/// Force computed intersection to be rounded to a given precision model.
///
@@ -128,7 +128,7 @@ public:
/// Same as above but doesn't compute intersection point. Faster.
static bool hasIntersection(const geom::Coordinate& p, const geom::Coordinate& p1, const geom::Coordinate& p2);
- enum intersection_type : unsigned char {
+ enum intersection_type : uint8_t {
/// Indicates that line segments do not intersect
NO_INTERSECTION = 0,
@@ -227,7 +227,7 @@ public:
* @return the intIndex'th intersection point in the direction of the
* specified input line segment
*/
- const geom::Coordinate& getIntersectionAlongSegment(int segmentIndex, int intIndex);
+ const geom::Coordinate& getIntersectionAlongSegment(size_t segmentIndex, size_t intIndex);
/** \brief
* Computes the index of the intIndex'th intersection point in the direction of
@@ -238,7 +238,7 @@ public:
*
* @return the index of the intersection point along the segment (0 or 1)
*/
- int getIndexAlongSegment(int segmentIndex, int intIndex);
+ size_t getIndexAlongSegment(size_t segmentIndex, size_t intIndex);
/** \brief
* Computes the "edge distance" of an intersection point along the specified
@@ -273,7 +273,7 @@ private:
* The indexes of the endpoints of the intersection lines, in order along
* the corresponding line
*/
- int intLineIndex[2][2];
+ size_t intLineIndex[2][2];
bool isProperVar;
//Coordinate &pa;
@@ -285,8 +285,8 @@ private:
return result == COLLINEAR_INTERSECTION;
}
- int computeIntersect(const geom::Coordinate& p1, const geom::Coordinate& p2,
- const geom::Coordinate& q1, const geom::Coordinate& q2);
+ uint8_t computeIntersect(const geom::Coordinate& p1, const geom::Coordinate& p2,
+ const geom::Coordinate& q1, const geom::Coordinate& q2);
bool
isEndPoint() const
@@ -296,7 +296,7 @@ private:
void computeIntLineIndex();
- void computeIntLineIndex(int segmentIndex);
+ void computeIntLineIndex(size_t segmentIndex);
int computeCollinearIntersection(const geom::Coordinate& p1, const geom::Coordinate& p2,
const geom::Coordinate& q1, const geom::Coordinate& q2);
diff --git a/include/geos/algorithm/locate/PointOnGeometryLocator.h b/include/geos/algorithm/locate/PointOnGeometryLocator.h
index c755de4..92100c0 100644
--- a/include/geos/algorithm/locate/PointOnGeometryLocator.h
+++ b/include/geos/algorithm/locate/PointOnGeometryLocator.h
@@ -34,7 +34,7 @@ namespace locate { // geos::algorithm::locate
*
* @author Martin Davis
*/
-class PointOnGeometryLocator {
+class GEOS_DLL PointOnGeometryLocator {
private:
protected:
public:
diff --git a/include/geos/edgegraph/HalfEdge.h b/include/geos/edgegraph/HalfEdge.h
index ccfa334..e8b8e67 100644
--- a/include/geos/edgegraph/HalfEdge.h
+++ b/include/geos/edgegraph/HalfEdge.h
@@ -130,6 +130,8 @@ public:
m_orig(p_orig)
{};
+ virtual ~HalfEdge() {};
+
/**
* Creates a HalfEdge pair representing an edge
* between two vertices located at coordinates p0 and p1.
diff --git a/include/geos/geom/Geometry.h b/include/geos/geom/Geometry.h
index ea00845..d05d71f 100644
--- a/include/geos/geom/Geometry.h
+++ b/include/geos/geom/Geometry.h
@@ -370,7 +370,7 @@ public:
}
/// Returns the coordinate dimension of this Geometry (2=XY, 3=XYZ, 4=XYZM in future).
- virtual int getCoordinateDimension() const = 0; //Abstract
+ virtual uint8_t getCoordinateDimension() const = 0; //Abstract
/**
* \brief
diff --git a/include/geos/geom/GeometryCollection.h b/include/geos/geom/GeometryCollection.h
index fab1fba..434e95f 100644
--- a/include/geos/geom/GeometryCollection.h
+++ b/include/geos/geom/GeometryCollection.h
@@ -110,7 +110,7 @@ public:
bool isDimensionStrict(Dimension::DimensionType d) const override;
/// Returns coordinate dimension.
- int getCoordinateDimension() const override;
+ uint8_t getCoordinateDimension() const override;
std::unique_ptr<Geometry> getBoundary() const override;
diff --git a/include/geos/geom/LineString.h b/include/geos/geom/LineString.h
index 87582d3..4253257 100644
--- a/include/geos/geom/LineString.h
+++ b/include/geos/geom/LineString.h
@@ -103,7 +103,7 @@ public:
int getBoundaryDimension() const override;
/// Returns coordinate dimension.
- int getCoordinateDimension() const override;
+ uint8_t getCoordinateDimension() const override;
/**
* \brief
diff --git a/include/geos/geom/Point.h b/include/geos/geom/Point.h
index bc84980..6f435f1 100644
--- a/include/geos/geom/Point.h
+++ b/include/geos/geom/Point.h
@@ -98,7 +98,7 @@ public:
Dimension::DimensionType getDimension() const override;
/// Returns coordinate dimension.
- int getCoordinateDimension() const override;
+ uint8_t getCoordinateDimension() const override;
/// Returns Dimension::False (Point has no boundary)
int getBoundaryDimension() const override;
diff --git a/include/geos/geom/Polygon.h b/include/geos/geom/Polygon.h
index abc1a99..6f3e678 100644
--- a/include/geos/geom/Polygon.h
+++ b/include/geos/geom/Polygon.h
@@ -92,7 +92,7 @@ public:
Dimension::DimensionType getDimension() const override;
/// Returns coordinate dimension.
- int getCoordinateDimension() const override;
+ uint8_t getCoordinateDimension() const override;
/// Returns 1 (Polygon boundary is a MultiLineString)
int getBoundaryDimension() const override;
diff --git a/include/geos/io/WKBWriter.h b/include/geos/io/WKBWriter.h
index d40e281..3b3799c 100644
--- a/include/geos/io/WKBWriter.h
+++ b/include/geos/io/WKBWriter.h
@@ -24,6 +24,7 @@
#include <geos/util/Machine.h> // for getMachineByteOrder
#include <iosfwd>
+#include <cstdint>
// Forward declarations
namespace geos {
@@ -97,7 +98,7 @@ public:
* Returns the output dimension used by the
* <code>WKBWriter</code>.
*/
- virtual int
+ virtual uint8_t
getOutputDimension() const
{
return defaultOutputDimension;
@@ -172,8 +173,8 @@ public:
private:
- int defaultOutputDimension;
- int outputDimension;
+ uint8_t defaultOutputDimension;
+ uint8_t outputDimension;
int byteOrder;
diff --git a/include/geos/io/WKTWriter.h b/include/geos/io/WKTWriter.h
index 6b888c7..e61d9f9 100644
--- a/include/geos/io/WKTWriter.h
+++ b/include/geos/io/WKTWriter.h
@@ -24,6 +24,7 @@
#include <geos/export.h>
#include <string>
+#include <cctype>
#ifdef _MSC_VER
#pragma warning(push)
@@ -261,8 +262,8 @@ private:
int level;
- int defaultOutputDimension;
- int outputDimension;
+ uint8_t defaultOutputDimension;
+ uint8_t outputDimension;
bool old3D;
void writeFormatted(
diff --git a/include/geos/operation/overlayng/OverlayEdge.h b/include/geos/operation/overlayng/OverlayEdge.h
index 243d80e..b1126fb 100644
--- a/include/geos/operation/overlayng/OverlayEdge.h
+++ b/include/geos/operation/overlayng/OverlayEdge.h
@@ -94,6 +94,7 @@ public:
bool isForward() const;
const Coordinate& directionPt() const override;
+ ~OverlayEdge() override {};
OverlayLabel* getLabel() const;
diff --git a/src/algorithm/LineIntersector.cpp b/src/algorithm/LineIntersector.cpp
index 080590c..6f9d101 100644
--- a/src/algorithm/LineIntersector.cpp
+++ b/src/algorithm/LineIntersector.cpp
@@ -150,7 +150,7 @@ LineIntersector::isIntersection(const Coordinate& pt) const
/*public*/
const Coordinate&
-LineIntersector::getIntersectionAlongSegment(int segmentIndex, int intIndex)
+LineIntersector::getIntersectionAlongSegment(size_t segmentIndex, size_t intIndex)
{
// lazily compute int line array
computeIntLineIndex();
@@ -158,8 +158,8 @@ LineIntersector::getIntersectionAlongSegment(int segmentIndex, int intIndex)
}
/*public*/
-int
-LineIntersector::getIndexAlongSegment(int segmentIndex, int intIndex)
+size_t
+LineIntersector::getIndexAlongSegment(size_t segmentIndex, size_t intIndex)
{
computeIntLineIndex();
return intLineIndex[segmentIndex][intIndex];
@@ -167,7 +167,7 @@ LineIntersector::getIndexAlongSegment(int segmentIndex, int intIndex)
/*private*/
void
-LineIntersector::computeIntLineIndex(int segmentIndex)
+LineIntersector::computeIntLineIndex(size_t segmentIndex)
{
double dist0 = getEdgeDistance(segmentIndex, 0);
double dist1 = getEdgeDistance(segmentIndex, 1);
@@ -206,7 +206,7 @@ LineIntersector::isInteriorIntersection()
/*public*/
bool
-LineIntersector::isInteriorIntersection(int inputLineIndex)
+LineIntersector::isInteriorIntersection(size_t inputLineIndex)
{
for(size_t i = 0; i < result; ++i) {
if(!(intPt[i].equals2D(*inputLines[inputLineIndex][0])
@@ -316,7 +316,7 @@ LineIntersector::hasIntersection(const Coordinate& p, const Coordinate& p1, cons
}
/*private*/
-int
+uint8_t
LineIntersector::computeIntersect(const Coordinate& p1, const Coordinate& p2,
const Coordinate& q1, const Coordinate& q2)
{
diff --git a/src/algorithm/MinimumBoundingCircle.cpp b/src/algorithm/MinimumBoundingCircle.cpp
index 4d064f3..2cd1538 100644
--- a/src/algorithm/MinimumBoundingCircle.cpp
+++ b/src/algorithm/MinimumBoundingCircle.cpp
@@ -64,7 +64,7 @@ std::unique_ptr<Geometry>
MinimumBoundingCircle::getMaximumDiameter()
{
compute();
- size_t dims = input->getCoordinateDimension();
+ uint8_t dims = input->getCoordinateDimension();
size_t len = 2;
switch(extremalPts.size()) {
case 0:
@@ -122,7 +122,7 @@ MinimumBoundingCircle::getDiameter()
case 1:
return std::unique_ptr<Geometry>(input->getFactory()->createPoint(centre));
}
- size_t dims = input->getCoordinateDimension();
+ uint8_t dims = input->getCoordinateDimension();
size_t len = 2;
auto cs = input->getFactory()->getCoordinateSequenceFactory()->create(len, dims);
// TODO: handle case of 3 extremal points, by computing a line from one of
diff --git a/src/geom/GeometryCollection.cpp b/src/geom/GeometryCollection.cpp
index 60bfb02..f49d840 100644
--- a/src/geom/GeometryCollection.cpp
+++ b/src/geom/GeometryCollection.cpp
@@ -152,10 +152,10 @@ GeometryCollection::getBoundaryDimension() const
return dimension;
}
-int
+uint8_t
GeometryCollection::getCoordinateDimension() const
{
- int dimension = 2;
+ uint8_t dimension = 2;
for(const auto& g : geometries) {
dimension = std::max(dimension, g->getCoordinateDimension());
diff --git a/src/geom/LineString.cpp b/src/geom/LineString.cpp
index dbd5ab0..0f6881c 100644
--- a/src/geom/LineString.cpp
+++ b/src/geom/LineString.cpp
@@ -136,7 +136,7 @@ LineString::getDimension() const
return Dimension::L; // line
}
-int
+uint8_t
LineString::getCoordinateDimension() const
{
return (int) points->getDimension();
diff --git a/src/geom/Point.cpp b/src/geom/Point.cpp
index 4536640..93bc34b 100644
--- a/src/geom/Point.cpp
+++ b/src/geom/Point.cpp
@@ -118,7 +118,7 @@ Point::getDimension() const
return Dimension::P; // point
}
-int
+uint8_t
Point::getCoordinateDimension() const
{
return (int) getCoordinatesRO()->getDimension();
diff --git a/src/geom/Polygon.cpp b/src/geom/Polygon.cpp
index 3bdc917..9c3a300 100644
--- a/src/geom/Polygon.cpp
+++ b/src/geom/Polygon.cpp
@@ -157,10 +157,10 @@ Polygon::getDimension() const
return Dimension::A; // area
}
-int
+uint8_t
Polygon::getCoordinateDimension() const
{
- int dimension = 2;
+ uint8_t dimension = 2;
if(shell != nullptr) {
dimension = std::max(dimension, shell->getCoordinateDimension());
diff --git a/src/operation/overlay/OverlayOp.cpp b/src/operation/overlay/OverlayOp.cpp
index db57681..2631416 100644
--- a/src/operation/overlay/OverlayOp.cpp
+++ b/src/operation/overlay/OverlayOp.cpp
@@ -416,7 +416,7 @@ OverlayOp::labelIncompleteNode(Node* n, int targetIndex)
// Only do this if input does have Z
// See https://trac.osgeo.org/geos/ticket/811
- if(targetGeom->getCoordinateDimension() < 3) {
+ if(targetGeom->getCoordinateDimension() < 3u) {
return;
}
diff --git a/tests/unit/operation/overlayng/LineLimiterTest.cpp b/tests/unit/operation/overlayng/LineLimiterTest.cpp
index deb992c..7832ea9 100644
--- a/tests/unit/operation/overlayng/LineLimiterTest.cpp
+++ b/tests/unit/operation/overlayng/LineLimiterTest.cpp
@@ -65,7 +65,7 @@ struct test_linelimiter_data {
geomRslt = std::move(lines[0]);
}
else {
- geomRslt = std::move(factory->createMultiLineString(std::move(lines)));
+ geomRslt = factory->createMultiLineString(std::move(lines));
}
return geomRslt;
}
diff --git a/tests/unit/shape/fractal/HilbertCodeTest.cpp b/tests/unit/shape/fractal/HilbertCodeTest.cpp
index b28ebaa..74373c8 100644
--- a/tests/unit/shape/fractal/HilbertCodeTest.cpp
+++ b/tests/unit/shape/fractal/HilbertCodeTest.cpp
@@ -27,7 +27,7 @@ struct test_hilbertcode_data {
void checkDecodeEncodeForLevel(uint32_t level)
{
uint32_t n = HilbertCode::levelSize(level);
- for (int i = 0; i < n; i++) {
+ for (uint32_t i = 0; i < n; i++) {
checkDecodeEncode(level, i);
}
}
@@ -53,13 +53,13 @@ template<>
void object::test<1>
()
{
- ensure_equals( HilbertCode::levelSize( 0 ), 1);
- ensure_equals( HilbertCode::levelSize( 1 ), 4);
- ensure_equals( HilbertCode::levelSize( 2 ), 16);
- ensure_equals( HilbertCode::levelSize( 3 ), 64);
- ensure_equals( HilbertCode::levelSize( 4 ), 256);
- ensure_equals( HilbertCode::levelSize( 5 ), 1024);
- ensure_equals( HilbertCode::levelSize( 6 ), 4096);
+ ensure_equals( HilbertCode::levelSize( 0 ), 1u);
+ ensure_equals( HilbertCode::levelSize( 1 ), 4u);
+ ensure_equals( HilbertCode::levelSize( 2 ), 16u);
+ ensure_equals( HilbertCode::levelSize( 3 ), 64u);
+ ensure_equals( HilbertCode::levelSize( 4 ), 256u);
+ ensure_equals( HilbertCode::levelSize( 5 ), 1024u);
+ ensure_equals( HilbertCode::levelSize( 6 ), 4096u);
}
@@ -68,25 +68,25 @@ template<>
void object::test<2>
()
{
- ensure_equals( HilbertCode::level( 1 ), 0);
+ ensure_equals( HilbertCode::level( 1 ), 0u);
- ensure_equals( HilbertCode::level( 2 ), 1);
- ensure_equals( HilbertCode::level( 3 ), 1);
- ensure_equals( HilbertCode::level( 4 ), 1);
+ ensure_equals( HilbertCode::level( 2 ), 1u);
+ ensure_equals( HilbertCode::level( 3 ), 1u);
+ ensure_equals( HilbertCode::level( 4 ), 1u);
- ensure_equals( HilbertCode::level( 5 ), 2);
- ensure_equals( HilbertCode::level( 13 ), 2);
- ensure_equals( HilbertCode::level( 15 ), 2);
- ensure_equals( HilbertCode::level( 16 ), 2);
+ ensure_equals( HilbertCode::level( 5 ), 2u);
+ ensure_equals( HilbertCode::level( 13 ), 2u);
+ ensure_equals( HilbertCode::level( 15 ), 2u);
+ ensure_equals( HilbertCode::level( 16 ), 2u);
- ensure_equals( HilbertCode::level( 17 ), 3);
- ensure_equals( HilbertCode::level( 63 ), 3);
- ensure_equals( HilbertCode::level( 64 ), 3);
+ ensure_equals( HilbertCode::level( 17 ), 3u);
+ ensure_equals( HilbertCode::level( 63 ), 3u);
+ ensure_equals( HilbertCode::level( 64 ), 3u);
- ensure_equals( HilbertCode::level( 65 ), 4);
- ensure_equals( HilbertCode::level( 255 ), 4);
- ensure_equals( HilbertCode::level( 255 ), 4);
- ensure_equals( HilbertCode::level( 256 ), 4);
+ ensure_equals( HilbertCode::level( 65 ), 4u);
+ ensure_equals( HilbertCode::level( 255 ), 4u);
+ ensure_equals( HilbertCode::level( 255 ), 4u);
+ ensure_equals( HilbertCode::level( 256 ), 4u);
}
diff --git a/tests/unit/shape/fractal/MortonCodeTest.cpp b/tests/unit/shape/fractal/MortonCodeTest.cpp
index b606653..0fac995 100644
--- a/tests/unit/shape/fractal/MortonCodeTest.cpp
+++ b/tests/unit/shape/fractal/MortonCodeTest.cpp
@@ -27,7 +27,7 @@ struct test_mortoncode_data {
void checkDecodeEncodeForLevel(uint32_t level)
{
uint32_t n = MortonCode::levelSize(level);
- for (int i = 0; i < n; i++) {
+ for (uint32_t i = 0; i < n; i++) {
checkDecodeEncode(i);
}
}
@@ -53,13 +53,13 @@ template<>
void object::test<1>
()
{
- ensure_equals( MortonCode::levelSize( 0 ), 1);
- ensure_equals( MortonCode::levelSize( 1 ), 4);
- ensure_equals( MortonCode::levelSize( 2 ), 16);
- ensure_equals( MortonCode::levelSize( 3 ), 64);
- ensure_equals( MortonCode::levelSize( 4 ), 256);
- ensure_equals( MortonCode::levelSize( 5 ), 1024);
- ensure_equals( MortonCode::levelSize( 6 ), 4096);
+ ensure_equals( MortonCode::levelSize( 0 ), 1u);
+ ensure_equals( MortonCode::levelSize( 1 ), 4u);
+ ensure_equals( MortonCode::levelSize( 2 ), 16u);
+ ensure_equals( MortonCode::levelSize( 3 ), 64u);
+ ensure_equals( MortonCode::levelSize( 4 ), 256u);
+ ensure_equals( MortonCode::levelSize( 5 ), 1024u);
+ ensure_equals( MortonCode::levelSize( 6 ), 4096u);
}
@@ -68,25 +68,25 @@ template<>
void object::test<2>
()
{
- ensure_equals( MortonCode::level( 1 ), 0);
+ ensure_equals( MortonCode::level( 1 ), 0u);
- ensure_equals( MortonCode::level( 2 ), 1);
- ensure_equals( MortonCode::level( 3 ), 1);
- ensure_equals( MortonCode::level( 4 ), 1);
+ ensure_equals( MortonCode::level( 2 ), 1u);
+ ensure_equals( MortonCode::level( 3 ), 1u);
+ ensure_equals( MortonCode::level( 4 ), 1u);
- ensure_equals( MortonCode::level( 5 ), 2);
- ensure_equals( MortonCode::level( 13 ), 2);
- ensure_equals( MortonCode::level( 15 ), 2);
- ensure_equals( MortonCode::level( 16 ), 2);
+ ensure_equals( MortonCode::level( 5 ), 2u);
+ ensure_equals( MortonCode::level( 13 ), 2u);
+ ensure_equals( MortonCode::level( 15 ), 2u);
+ ensure_equals( MortonCode::level( 16 ), 2u);
- ensure_equals( MortonCode::level( 17 ), 3);
- ensure_equals( MortonCode::level( 63 ), 3);
- ensure_equals( MortonCode::level( 64 ), 3);
+ ensure_equals( MortonCode::level( 17 ), 3u);
+ ensure_equals( MortonCode::level( 63 ), 3u);
+ ensure_equals( MortonCode::level( 64 ), 3u);
- ensure_equals( MortonCode::level( 65 ), 4);
- ensure_equals( MortonCode::level( 255 ), 4);
- ensure_equals( MortonCode::level( 255 ), 4);
- ensure_equals( MortonCode::level( 256 ), 4);
+ ensure_equals( MortonCode::level( 65 ), 4u);
+ ensure_equals( MortonCode::level( 255 ), 4u);
+ ensure_equals( MortonCode::level( 255 ), 4u);
+ ensure_equals( MortonCode::level( 256 ), 4u);
}
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 7 ----
capi/geos_ts_c.cpp | 10 ++---
include/geos/algorithm/LineIntersector.h | 16 ++++----
.../geos/algorithm/locate/PointOnGeometryLocator.h | 2 +-
include/geos/edgegraph/HalfEdge.h | 2 +
include/geos/geom/Geometry.h | 2 +-
include/geos/geom/GeometryCollection.h | 2 +-
include/geos/geom/LineString.h | 2 +-
include/geos/geom/Point.h | 2 +-
include/geos/geom/Polygon.h | 2 +-
include/geos/io/WKBWriter.h | 7 ++--
include/geos/io/WKTWriter.h | 5 ++-
include/geos/operation/overlayng/OverlayEdge.h | 1 +
src/algorithm/LineIntersector.cpp | 12 +++---
src/algorithm/MinimumBoundingCircle.cpp | 4 +-
src/geom/GeometryCollection.cpp | 4 +-
src/geom/LineString.cpp | 2 +-
src/geom/Point.cpp | 2 +-
src/geom/Polygon.cpp | 4 +-
src/operation/overlay/OverlayOp.cpp | 2 +-
tests/unit/operation/overlayng/LineLimiterTest.cpp | 2 +-
tests/unit/shape/fractal/HilbertCodeTest.cpp | 46 +++++++++++-----------
tests/unit/shape/fractal/MortonCodeTest.cpp | 46 +++++++++++-----------
23 files changed, 91 insertions(+), 93 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list