[geos-commits] [SCM] GEOS branch master updated. 0bdfdd260cd607d982972194d7403deacc567bcd
git at osgeo.org
git at osgeo.org
Fri Sep 27 12:50:58 PDT 2019
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 0bdfdd260cd607d982972194d7403deacc567bcd (commit)
via 15368d8a261a35aaa5db97de70cc84ba02e1a316 (commit)
via 59f62c877b01061f2a6cb9a656514aab6ca5ed32 (commit)
via d7ea92b4f31ea45f822216a2890c324f69cd719a (commit)
via cde5b2caa7edbd3b8bd9cd0916d9079ca6523e7c (commit)
via 53dd0de31f078ec8d888830ab28c70b18f28a74b (commit)
via d85c8d5c04e90a54626ecfb7f0e874e2a1287bec (commit)
via 13d22074f3ccd7786e5a7eeeab7b07cf34125a4b (commit)
from 9924c15fc0611e2e49d5665b18122bfa4c5fe1c0 (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 0bdfdd260cd607d982972194d7403deacc567bcd
Author: Howard Butler <howard at hobu.co>
Date: Fri Sep 27 10:18:01 2019 -0500
check for empty extHandle using nullptr instead of 0
diff --git a/capi/geos_ts_c.cpp b/capi/geos_ts_c.cpp
index edaea13..fab762c 100644
--- a/capi/geos_ts_c.cpp
+++ b/capi/geos_ts_c.cpp
@@ -432,7 +432,7 @@ extern "C" {
char
GEOSDisjoint_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -463,7 +463,7 @@ extern "C" {
char
GEOSTouches_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -490,7 +490,7 @@ extern "C" {
char
GEOSIntersects_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -517,7 +517,7 @@ extern "C" {
char
GEOSCrosses_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -544,7 +544,7 @@ extern "C" {
char
GEOSWithin_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -575,7 +575,7 @@ extern "C" {
char
GEOSContains_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -602,7 +602,7 @@ extern "C" {
char
GEOSOverlaps_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -629,7 +629,7 @@ extern "C" {
char
GEOSCovers_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -656,7 +656,7 @@ extern "C" {
char
GEOSCoveredBy_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -688,7 +688,7 @@ extern "C" {
char
GEOSRelatePattern_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2, const char* pat)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -717,7 +717,7 @@ extern "C" {
GEOSRelatePatternMatch_r(GEOSContextHandle_t extHandle, const char* mat,
const char* pat)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -750,7 +750,7 @@ extern "C" {
char*
GEOSRelate_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -785,7 +785,7 @@ extern "C" {
char*
GEOSRelateBoundaryNodeRule_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2, int bnr)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -852,7 +852,7 @@ extern "C" {
char
GEOSisValid_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -889,7 +889,7 @@ extern "C" {
char*
GEOSisValidReason_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -937,7 +937,7 @@ extern "C" {
GEOSisValidDetail_r(GEOSContextHandle_t extHandle, const Geometry* g,
int flags, char** reason, Geometry** location)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -993,7 +993,7 @@ extern "C" {
char
GEOSEquals_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -1020,7 +1020,7 @@ extern "C" {
char
GEOSEqualsExact_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2, double tolerance)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -1049,7 +1049,7 @@ extern "C" {
{
assert(0 != dist);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -1078,7 +1078,7 @@ extern "C" {
{
assert(0 != dist);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -1107,7 +1107,7 @@ extern "C" {
{
assert(0 != dist);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -1137,7 +1137,7 @@ extern "C" {
{
assert(0 != dist);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -1166,7 +1166,7 @@ extern "C" {
{
assert(0 != dist);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -1196,7 +1196,7 @@ extern "C" {
{
assert(0 != dist);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -1225,7 +1225,7 @@ extern "C" {
{
assert(0 != area);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -1254,7 +1254,7 @@ extern "C" {
{
assert(0 != length);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -1281,7 +1281,7 @@ extern "C" {
CoordinateSequence*
GEOSNearestPoints_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1311,7 +1311,7 @@ extern "C" {
Geometry*
GEOSGeomFromWKT_r(GEOSContextHandle_t extHandle, const char* wkt)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1341,7 +1341,7 @@ extern "C" {
char*
GEOSGeomToWKT_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1371,7 +1371,7 @@ extern "C" {
{
assert(0 != size);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1411,7 +1411,7 @@ extern "C" {
Geometry*
GEOSGeomFromWKB_buf_r(GEOSContextHandle_t extHandle, const unsigned char* wkb, size_t size)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1446,7 +1446,7 @@ extern "C" {
unsigned char*
GEOSGeomToHEX_buf_r(GEOSContextHandle_t extHandle, const Geometry* g, size_t* size)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1484,7 +1484,7 @@ extern "C" {
Geometry*
GEOSGeomFromHEX_buf_r(GEOSContextHandle_t extHandle, const unsigned char* hex, size_t size)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1518,7 +1518,7 @@ extern "C" {
char
GEOSisEmpty_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -1544,7 +1544,7 @@ extern "C" {
char
GEOSisSimple_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -1571,7 +1571,7 @@ extern "C" {
char
GEOSisRing_r(GEOSContextHandle_t extHandle, const Geometry* g)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -1607,7 +1607,7 @@ extern "C" {
char*
GEOSGeomType_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1637,7 +1637,7 @@ extern "C" {
int
GEOSGeomTypeId_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return -1;
}
@@ -1667,7 +1667,7 @@ extern "C" {
Geometry*
GEOSEnvelope_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1695,7 +1695,7 @@ extern "C" {
Geometry*
GEOSIntersection_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1723,7 +1723,7 @@ extern "C" {
Geometry*
GEOSBuffer_r(GEOSContextHandle_t extHandle, const Geometry* g1, double width, int quadrantsegments)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1756,7 +1756,7 @@ extern "C" {
using geos::operation::buffer::BufferOp;
using geos::util::IllegalArgumentException;
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1803,7 +1803,7 @@ extern "C" {
GEOSOffsetCurve_r(GEOSContextHandle_t extHandle, const Geometry* g1, double width, int quadsegs, int joinStyle,
double mitreLimit)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1851,7 +1851,7 @@ extern "C" {
GEOSSingleSidedBuffer_r(GEOSContextHandle_t extHandle, const Geometry* g1, double width, int quadsegs, int joinStyle,
double mitreLimit, int leftSide)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1893,7 +1893,7 @@ extern "C" {
Geometry*
GEOSConvexHull_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1922,7 +1922,7 @@ extern "C" {
Geometry*
GEOSMinimumRotatedRectangle_r(GEOSContextHandle_t extHandle, const Geometry* g)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1951,7 +1951,7 @@ extern "C" {
Geometry*
GEOSMinimumWidth_r(GEOSContextHandle_t extHandle, const Geometry* g)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -1980,7 +1980,7 @@ extern "C" {
Geometry*
GEOSMinimumClearanceLine_r(GEOSContextHandle_t extHandle, const Geometry* g)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2009,7 +2009,7 @@ extern "C" {
int
GEOSMinimumClearance_r(GEOSContextHandle_t extHandle, const Geometry* g, double* d)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -2039,7 +2039,7 @@ extern "C" {
Geometry*
GEOSDifference_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2067,7 +2067,7 @@ extern "C" {
Geometry*
GEOSBoundary_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2095,7 +2095,7 @@ extern "C" {
Geometry*
GEOSSymDifference_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2124,7 +2124,7 @@ extern "C" {
Geometry*
GEOSUnion_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* g2)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2159,7 +2159,7 @@ extern "C" {
Geometry*
GEOSCoverageUnion_r(GEOSContextHandle_t extHandle, const Geometry* g)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2187,7 +2187,7 @@ extern "C" {
Geometry*
GEOSUnaryUnion_r(GEOSContextHandle_t extHandle, const Geometry* g)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2222,7 +2222,7 @@ extern "C" {
Geometry*
GEOSNode_r(GEOSContextHandle_t extHandle, const Geometry* g)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2257,7 +2257,7 @@ extern "C" {
Geometry*
GEOSUnionCascaded_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2292,7 +2292,7 @@ extern "C" {
Geometry*
GEOSPointOnSurface_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2325,7 +2325,7 @@ extern "C" {
Geometry*
GEOSClipByRect_r(GEOSContextHandle_t extHandle, const Geometry* g, double xmin, double ymin, double xmax, double ymax)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2377,7 +2377,7 @@ extern "C" {
delete a;
}
catch(const std::exception& e) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -2389,7 +2389,7 @@ extern "C" {
handle->ERROR_MESSAGE("%s", e.what());
}
catch(...) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -2407,7 +2407,7 @@ extern "C" {
{
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -2425,7 +2425,7 @@ extern "C" {
{
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -2444,7 +2444,7 @@ extern "C" {
{
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return -1;
}
@@ -2476,7 +2476,7 @@ extern "C" {
{
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return -1;
}
@@ -2503,7 +2503,7 @@ extern "C" {
int
GEOSGetNumInteriorRings_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return -1;
}
@@ -2536,7 +2536,7 @@ extern "C" {
int
GEOSGetNumGeometries_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return -1;
}
@@ -2567,7 +2567,7 @@ extern "C" {
const Geometry*
GEOSGetGeometryN_r(GEOSContextHandle_t extHandle, const Geometry* g1, int n)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2597,7 +2597,7 @@ extern "C" {
Geometry*
GEOSGeomGetPointN_r(GEOSContextHandle_t extHandle, const Geometry* g1, int n)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2632,7 +2632,7 @@ extern "C" {
Geometry*
GEOSGeomGetStartPoint_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2667,7 +2667,7 @@ extern "C" {
Geometry*
GEOSGeomGetEndPoint_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2703,7 +2703,7 @@ extern "C" {
char
GEOSisClosed_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -2747,7 +2747,7 @@ extern "C" {
int
GEOSGeomGetLength_r(GEOSContextHandle_t extHandle, const Geometry* g1, double* length)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -2783,7 +2783,7 @@ extern "C" {
int
GEOSGeomGetNumPoints_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return -1;
}
@@ -2819,7 +2819,7 @@ extern "C" {
int
GEOSGeomGetX_r(GEOSContextHandle_t extHandle, const Geometry* g1, double* x)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -2856,7 +2856,7 @@ extern "C" {
int
GEOSGeomGetY_r(GEOSContextHandle_t extHandle, const Geometry* g1, double* y)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -2893,7 +2893,7 @@ extern "C" {
int
GEOSGeomGetZ_r(GEOSContextHandle_t extHandle, const Geometry* g1, double* z)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -2930,7 +2930,7 @@ extern "C" {
const Geometry*
GEOSGetExteriorRing_r(GEOSContextHandle_t extHandle, const Geometry* g1)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2965,7 +2965,7 @@ extern "C" {
const Geometry*
GEOSGetInteriorRingN_r(GEOSContextHandle_t extHandle, const Geometry* g1, int n)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -2996,7 +2996,7 @@ extern "C" {
Geometry*
GEOSGetCentroid_r(GEOSContextHandle_t extHandle, const Geometry* g)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -3029,7 +3029,7 @@ extern "C" {
GEOSMinimumBoundingCircle_r(GEOSContextHandle_t extHandle, const Geometry* g,
double* radius, Geometry** center)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -3066,7 +3066,7 @@ extern "C" {
Geometry*
GEOSGeom_createEmptyCollection_r(GEOSContextHandle_t extHandle, int type)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -3120,7 +3120,7 @@ extern "C" {
Geometry*
GEOSGeom_createCollection_r(GEOSContextHandle_t extHandle, int type, Geometry** geoms, unsigned int ngeoms)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -3177,7 +3177,7 @@ extern "C" {
Geometry*
GEOSPolygonize_r(GEOSContextHandle_t extHandle, const Geometry* const* g, unsigned int ngeoms)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -3357,7 +3357,7 @@ extern "C" {
Geometry*
GEOSPolygonizer_getCutEdges_r(GEOSContextHandle_t extHandle, const Geometry* const* g, unsigned int ngeoms)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -3421,7 +3421,7 @@ extern "C" {
GEOSPolygonize_full_r(GEOSContextHandle_t extHandle, const Geometry* g,
Geometry** cuts, Geometry** dangles, Geometry** invalid)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -3507,7 +3507,7 @@ extern "C" {
Geometry*
GEOSLineMerge_r(GEOSContextHandle_t extHandle, const Geometry* g)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -3560,7 +3560,7 @@ extern "C" {
{
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return nullptr;
}
@@ -3590,7 +3590,7 @@ extern "C" {
{
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -3618,7 +3618,7 @@ extern "C" {
{
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -3658,7 +3658,7 @@ extern "C" {
{
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return -1;
}
@@ -3682,7 +3682,7 @@ extern "C" {
int
GEOS_getWKBOutputDims_r(GEOSContextHandle_t extHandle)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return -1;
}
@@ -3698,7 +3698,7 @@ extern "C" {
int
GEOS_setWKBOutputDims_r(GEOSContextHandle_t extHandle, int newdims)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return -1;
}
@@ -3721,7 +3721,7 @@ extern "C" {
int
GEOS_getWKBByteOrder_r(GEOSContextHandle_t extHandle)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return -1;
}
@@ -3737,7 +3737,7 @@ extern "C" {
int
GEOS_setWKBByteOrder_r(GEOSContextHandle_t extHandle, int byteOrder)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return -1;
}
@@ -3757,7 +3757,7 @@ extern "C" {
CoordinateSequence*
GEOSCoordSeq_create_r(GEOSContextHandle_t extHandle, unsigned int size, unsigned int dims)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -3794,7 +3794,7 @@ extern "C" {
unsigned int idx, unsigned int dim, double val)
{
assert(0 != cs);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -3840,7 +3840,7 @@ extern "C" {
GEOSCoordSeq_setXY_r(GEOSContextHandle_t extHandle, CoordinateSequence* cs, unsigned int idx, double x, double y)
{
assert(0 != cs);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -3868,7 +3868,7 @@ extern "C" {
GEOSCoordSeq_setXYZ_r(GEOSContextHandle_t extHandle, CoordinateSequence* cs, unsigned int idx, double x, double y, double z)
{
assert(0 != cs);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -3897,7 +3897,7 @@ extern "C" {
{
assert(0 != cs);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -3927,7 +3927,7 @@ extern "C" {
assert(0 != cs);
assert(0 != val);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -3975,7 +3975,7 @@ extern "C" {
GEOSCoordSeq_getXY_r(GEOSContextHandle_t extHandle, const CoordinateSequence* cs, unsigned int idx, double* x, double* y)
{
assert(0 != cs);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -4005,7 +4005,7 @@ extern "C" {
GEOSCoordSeq_getXYZ_r(GEOSContextHandle_t extHandle, const CoordinateSequence* cs, unsigned int idx, double* x, double* y, double* z)
{
assert(0 != cs);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -4038,7 +4038,7 @@ extern "C" {
assert(0 != cs);
assert(0 != size);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -4069,7 +4069,7 @@ extern "C" {
assert(0 != cs);
assert(0 != dims);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -4135,7 +4135,7 @@ extern "C" {
delete s;
}
catch(const std::exception& e) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -4147,7 +4147,7 @@ extern "C" {
handle->ERROR_MESSAGE("%s", e.what());
}
catch(...) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -4163,7 +4163,7 @@ extern "C" {
const CoordinateSequence*
GEOSGeom_getCoordSeq_r(GEOSContextHandle_t extHandle, const Geometry* g)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -4202,7 +4202,7 @@ extern "C" {
Geometry*
GEOSGeom_createEmptyPoint_r(GEOSContextHandle_t extHandle)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -4229,7 +4229,7 @@ extern "C" {
Geometry*
GEOSGeom_createPoint_r(GEOSContextHandle_t extHandle, CoordinateSequence* cs)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -4256,7 +4256,7 @@ extern "C" {
Geometry*
GEOSGeom_createPointFromXY_r(GEOSContextHandle_t extHandle, double x, double y)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -4284,7 +4284,7 @@ extern "C" {
Geometry*
GEOSGeom_createLinearRing_r(GEOSContextHandle_t extHandle, CoordinateSequence* cs)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -4312,7 +4312,7 @@ extern "C" {
Geometry*
GEOSGeom_createEmptyLineString_r(GEOSContextHandle_t extHandle)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -4340,7 +4340,7 @@ extern "C" {
Geometry*
GEOSGeom_createLineString_r(GEOSContextHandle_t extHandle, CoordinateSequence* cs)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -4368,7 +4368,7 @@ extern "C" {
Geometry*
GEOSGeom_createEmptyPolygon_r(GEOSContextHandle_t extHandle)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -4398,7 +4398,7 @@ extern "C" {
// FIXME: holes must be non-nullptr or may be nullptr?
//assert(0 != holes);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -4445,7 +4445,7 @@ extern "C" {
{
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -4476,7 +4476,7 @@ extern "C" {
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -4529,7 +4529,7 @@ extern "C" {
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return -1;
}
@@ -4557,7 +4557,7 @@ extern "C" {
int
GEOSGeom_getDimensions_r(GEOSContextHandle_t extHandle, const Geometry* g)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -4583,7 +4583,7 @@ extern "C" {
int
GEOSGeom_getCoordinateDimension_r(GEOSContextHandle_t extHandle, const Geometry* g)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -4609,7 +4609,7 @@ extern "C" {
int
GEOSGeom_getXMin_r(GEOSContextHandle_t extHandle, const Geometry* g, double* value)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -4640,7 +4640,7 @@ extern "C" {
int
GEOSGeom_getXMax_r(GEOSContextHandle_t extHandle, const Geometry* g, double* value)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -4671,7 +4671,7 @@ extern "C" {
int
GEOSGeom_getYMin_r(GEOSContextHandle_t extHandle, const Geometry* g, double* value)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -4702,7 +4702,7 @@ extern "C" {
int
GEOSGeom_getYMax_r(GEOSContextHandle_t extHandle, const Geometry* g, double* value)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -4733,7 +4733,7 @@ extern "C" {
Geometry*
GEOSSimplify_r(GEOSContextHandle_t extHandle, const Geometry* g1, double tolerance)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -4762,7 +4762,7 @@ extern "C" {
Geometry*
GEOSTopologyPreserveSimplify_r(GEOSContextHandle_t extHandle, const Geometry* g1, double tolerance)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -4793,7 +4793,7 @@ extern "C" {
WKTReader*
GEOSWKTReader_create_r(GEOSContextHandle_t extHandle)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -4826,7 +4826,7 @@ extern "C" {
delete reader;
}
catch(const std::exception& e) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -4838,7 +4838,7 @@ extern "C" {
handle->ERROR_MESSAGE("%s", e.what());
}
catch(...) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -4857,7 +4857,7 @@ extern "C" {
{
assert(0 != reader);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -4885,7 +4885,7 @@ extern "C" {
WKTWriter*
GEOSWKTWriter_create_r(GEOSContextHandle_t extHandle)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -4919,7 +4919,7 @@ extern "C" {
delete Writer;
}
catch(const std::exception& e) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -4931,7 +4931,7 @@ extern "C" {
handle->ERROR_MESSAGE("%s", e.what());
}
catch(...) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -4950,7 +4950,7 @@ extern "C" {
{
assert(0 != writer);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -4980,7 +4980,7 @@ extern "C" {
{
assert(0 != writer);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -4998,7 +4998,7 @@ extern "C" {
{
assert(0 != writer);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -5016,7 +5016,7 @@ extern "C" {
{
assert(0 != writer);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -5042,7 +5042,7 @@ extern "C" {
{
assert(0 != writer);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return -1;
}
@@ -5072,7 +5072,7 @@ extern "C" {
{
assert(0 != writer);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -5089,7 +5089,7 @@ extern "C" {
WKBReader*
GEOSWKBReader_create_r(GEOSContextHandle_t extHandle)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -5122,7 +5122,7 @@ extern "C" {
delete reader;
}
catch(const std::exception& e) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -5134,7 +5134,7 @@ extern "C" {
handle->ERROR_MESSAGE("%s", e.what());
}
catch(...) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -5160,7 +5160,7 @@ extern "C" {
assert(0 != reader);
assert(0 != wkb);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -5198,7 +5198,7 @@ extern "C" {
assert(0 != reader);
assert(0 != hex);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -5230,7 +5230,7 @@ extern "C" {
WKBWriter*
GEOSWKBWriter_create_r(GEOSContextHandle_t extHandle)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -5263,7 +5263,7 @@ extern "C" {
delete Writer;
}
catch(const std::exception& e) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -5275,7 +5275,7 @@ extern "C" {
handle->ERROR_MESSAGE("%s", e.what());
}
catch(...) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -5297,7 +5297,7 @@ extern "C" {
assert(0 != geom);
assert(0 != size);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -5337,7 +5337,7 @@ extern "C" {
assert(0 != geom);
assert(0 != size);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -5374,7 +5374,7 @@ extern "C" {
{
assert(0 != writer);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -5399,7 +5399,7 @@ extern "C" {
{
assert(0 != writer);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -5423,7 +5423,7 @@ extern "C" {
{
assert(0 != writer);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -5449,7 +5449,7 @@ extern "C" {
{
assert(0 != writer);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -5473,7 +5473,7 @@ extern "C" {
{
assert(0 != writer);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return -1;
}
@@ -5499,7 +5499,7 @@ extern "C" {
{
assert(0 != writer);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -5523,7 +5523,7 @@ extern "C" {
const geos::geom::prep::PreparedGeometry*
GEOSPrepare_r(GEOSContextHandle_t extHandle, const Geometry* g)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -5557,7 +5557,7 @@ extern "C" {
delete a;
}
catch(const std::exception& e) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -5569,7 +5569,7 @@ extern "C" {
handle->ERROR_MESSAGE("%s", e.what());
}
catch(...) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -5589,7 +5589,7 @@ extern "C" {
assert(0 != pg);
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -5620,7 +5620,7 @@ extern "C" {
assert(0 != pg);
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -5651,7 +5651,7 @@ extern "C" {
assert(0 != pg);
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -5682,7 +5682,7 @@ extern "C" {
assert(0 != pg);
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -5713,7 +5713,7 @@ extern "C" {
assert(0 != pg);
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -5744,7 +5744,7 @@ extern "C" {
assert(0 != pg);
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -5775,7 +5775,7 @@ extern "C" {
assert(0 != pg);
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -5806,7 +5806,7 @@ extern "C" {
assert(0 != pg);
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -5837,7 +5837,7 @@ extern "C" {
assert(0 != pg);
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -5868,7 +5868,7 @@ extern "C" {
assert(0 != pg);
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -5900,7 +5900,7 @@ extern "C" {
GEOSSTRtree_create_r(GEOSContextHandle_t extHandle,
size_t nodeCapacity)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -5939,7 +5939,7 @@ extern "C" {
tree->insert(g->getEnvelopeInternal(), item);
}
catch(const std::exception& e) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -5951,7 +5951,7 @@ extern "C" {
handle->ERROR_MESSAGE("%s", e.what());
}
catch(...) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -5981,7 +5981,7 @@ extern "C" {
tree->query(g->getEnvelopeInternal(), visitor);
}
catch(const std::exception& e) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -5993,7 +5993,7 @@ extern "C" {
handle->ERROR_MESSAGE("%s", e.what());
}
catch(...) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -6059,7 +6059,7 @@ extern "C" {
}
}
catch(const std::exception& e) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -6071,7 +6071,7 @@ extern "C" {
handle->ERROR_MESSAGE("%s", e.what());
}
catch(...) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -6101,7 +6101,7 @@ extern "C" {
tree->iterate(visitor);
}
catch(const std::exception& e) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -6113,7 +6113,7 @@ extern "C" {
handle->ERROR_MESSAGE("%s", e.what());
}
catch(...) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -6135,7 +6135,7 @@ extern "C" {
assert(0 != tree);
assert(0 != g);
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -6169,7 +6169,7 @@ extern "C" {
delete tree;
}
catch(const std::exception& e) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -6181,7 +6181,7 @@ extern "C" {
handle->ERROR_MESSAGE("%s", e.what());
}
catch(...) {
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return;
}
@@ -6199,7 +6199,7 @@ extern "C" {
const Geometry* g,
const Geometry* p)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return -1.0;
}
GEOSContextHandleInternal_t* handle =
@@ -6233,7 +6233,7 @@ extern "C" {
Geometry*
GEOSInterpolate_r(GEOSContextHandle_t extHandle, const Geometry* g, double d)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
GEOSContextHandleInternal_t* handle =
@@ -6285,7 +6285,7 @@ extern "C" {
GEOSGeom_extractUniquePoints_r(GEOSContextHandle_t extHandle,
const GEOSGeometry* g)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
GEOSContextHandleInternal_t* handle = 0;
@@ -6339,7 +6339,7 @@ extern "C" {
using geos::geom::Coordinate;
using geos::algorithm::Orientation;
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 2;
}
@@ -6369,7 +6369,7 @@ extern "C" {
{
using namespace geos::operation::sharedpaths;
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
GEOSContextHandleInternal_t* handle =
@@ -6447,7 +6447,7 @@ extern "C" {
{
using namespace geos::operation::overlay::snap;
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
GEOSContextHandleInternal_t* handle =
@@ -6475,7 +6475,7 @@ extern "C" {
BufferParameters*
GEOSBufferParams_create_r(GEOSContextHandle_t extHandle)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -6510,7 +6510,7 @@ extern "C" {
GEOSBufferParams_setEndCapStyle_r(GEOSContextHandle_t extHandle,
GEOSBufferParams* p, int style)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -6541,7 +6541,7 @@ extern "C" {
GEOSBufferParams_setJoinStyle_r(GEOSContextHandle_t extHandle,
GEOSBufferParams* p, int style)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -6572,7 +6572,7 @@ extern "C" {
GEOSBufferParams_setMitreLimit_r(GEOSContextHandle_t extHandle,
GEOSBufferParams* p, double limit)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -6600,7 +6600,7 @@ extern "C" {
GEOSBufferParams_setQuadrantSegments_r(GEOSContextHandle_t extHandle,
GEOSBufferParams* p, int segs)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -6628,7 +6628,7 @@ extern "C" {
GEOSBufferParams_setSingleSided_r(GEOSContextHandle_t extHandle,
GEOSBufferParams* p, int ss)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
@@ -6657,7 +6657,7 @@ extern "C" {
{
using geos::operation::buffer::BufferOp;
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -6686,7 +6686,7 @@ extern "C" {
Geometry*
GEOSDelaunayTriangulation_r(GEOSContextHandle_t extHandle, const Geometry* g1, double tolerance, int onlyEdges)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -6728,7 +6728,7 @@ extern "C" {
GEOSVoronoiDiagram_r(GEOSContextHandle_t extHandle, const Geometry* g1, const Geometry* env, double tolerance,
int onlyEdges)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return NULL;
}
@@ -6774,7 +6774,7 @@ extern "C" {
double bx0, double by0, double bx1, double by1,
double* cx, double* cy)
{
- if(0 == extHandle) {
+ if(nullptr == extHandle) {
return 0;
}
commit 15368d8a261a35aaa5db97de70cc84ba02e1a316
Author: Howard Butler <howard at hobu.co>
Date: Fri Sep 27 09:48:14 2019 -0500
clean up unused variable warnings
diff --git a/doc/example.cpp b/doc/example.cpp
index 182f414..8d091ab 100644
--- a/doc/example.cpp
+++ b/doc/example.cpp
@@ -560,7 +560,7 @@ do_all()
}
}
// Geometry Collection is not a valid argument
- catch(const IllegalArgumentException& exc) {
+ catch(const IllegalArgumentException&) {
cout << " X\t";
}
catch(const std::exception& exc) {
@@ -594,7 +594,7 @@ do_all()
}
}
// Geometry Collection is not a valid argument
- catch(const IllegalArgumentException& exc) {
+ catch(const IllegalArgumentException&) {
cout << " X\t";
}
catch(const std::exception& exc) {
@@ -628,7 +628,7 @@ do_all()
}
}
// Geometry Collection is not a valid argument
- catch(const IllegalArgumentException& exc) {
+ catch(const IllegalArgumentException&) {
cout << " X\t";
}
catch(const std::exception& exc) {
@@ -662,7 +662,7 @@ do_all()
}
}
// Geometry Collection is not a valid argument
- catch(const IllegalArgumentException& exc) {
+ catch(const IllegalArgumentException&) {
cout << " X\t";
}
catch(const std::exception& exc) {
@@ -696,7 +696,7 @@ do_all()
}
}
// Geometry Collection is not a valid argument
- catch(const IllegalArgumentException& exc) {
+ catch(const IllegalArgumentException&) {
cout << " X\t";
}
catch(const std::exception& exc) {
@@ -730,7 +730,7 @@ do_all()
}
}
// Geometry Collection is not a valid argument
- catch(const IllegalArgumentException& exc) {
+ catch(const IllegalArgumentException&) {
cout << " X\t";
}
catch(const std::exception& exc) {
@@ -764,7 +764,7 @@ do_all()
}
}
// Geometry Collection is not a valid argument
- catch(const IllegalArgumentException& exc) {
+ catch(const IllegalArgumentException&) {
cout << " X\t";
}
catch(const std::exception& exc) {
@@ -803,7 +803,7 @@ do_all()
auto im = g1->relate(g2);
}
// Geometry Collection is not a valid argument
- catch(const IllegalArgumentException& exc) {
+ catch(const IllegalArgumentException&) {
cout << " X\t";
}
catch(const std::exception& exc) {
@@ -837,7 +837,7 @@ do_all()
}
}
// Geometry Collection is not a valid argument
- catch(const IllegalArgumentException& exc) {
+ catch(const IllegalArgumentException&) {
cout << " X\t";
}
catch(const std::exception& exc) {
@@ -872,7 +872,7 @@ do_all()
}
}
// Geometry Collection is not a valid argument
- catch(const IllegalArgumentException& exc) {
+ catch(const IllegalArgumentException&) {
cout << " X\t";
}
catch(const std::exception& exc) {
@@ -907,7 +907,7 @@ do_all()
}
}
// Geometry Collection is not a valid argument
- catch(const IllegalArgumentException& exc) {
+ catch(const IllegalArgumentException&) {
cout << " X\t";
}
catch(const std::exception& exc) {
@@ -945,7 +945,7 @@ do_all()
newgeoms->push_back(g3);
}
// It's illegal to union a collection ...
- catch(const IllegalArgumentException& ill) {
+ catch(const IllegalArgumentException&) {
//cerr <<ill.toString()<<"\n";
}
catch(const std::exception& exc) {
@@ -980,7 +980,7 @@ do_all()
newgeoms->push_back(g3);
}
// Collection are illegal as intersection argument
- catch(const IllegalArgumentException& ill) {
+ catch(const IllegalArgumentException&) {
//cerr <<ill.toString()<<"\n";
}
catch(const std::exception& exc) {
@@ -1013,7 +1013,7 @@ do_all()
newgeoms->push_back(g3);
}
// Collection are illegal as difference argument
- catch(const IllegalArgumentException& ill) {
+ catch(const IllegalArgumentException&) {
//cerr <<ill.toString()<<"\n";
}
catch(const std::exception& exc) {
@@ -1046,7 +1046,7 @@ do_all()
newgeoms->push_back(g3);
}
// Collection are illegal as symdifference argument
- catch(const IllegalArgumentException& ill) {
+ catch(const IllegalArgumentException&) {
//cerr <<ill.toString()<<"\n";
}
catch(const std::exception& exc) {
diff --git a/tests/unit/geom/CoordinateArraySequenceFactoryTest.cpp b/tests/unit/geom/CoordinateArraySequenceFactoryTest.cpp
index ab8d591..caea683 100644
--- a/tests/unit/geom/CoordinateArraySequenceFactoryTest.cpp
+++ b/tests/unit/geom/CoordinateArraySequenceFactoryTest.cpp
@@ -52,7 +52,7 @@ void object::test<1>
ensure(nullptr != derived);
ensure(typeid(derived).name(), typeid(derived) == typeid(CoordinateArrayFactoryCPtr));
}
- catch(std::exception& e) {
+ catch(std::exception& /* e */) {
/** ignore failure. TODO figure out why this fails on BSD/Clang
* https://trac.osgeo.org/geos/ticket/894 and then put back**/
//fail( e.what() );
diff --git a/tests/unit/geom/FixedSizeCoordinateSequenceTest.cpp b/tests/unit/geom/FixedSizeCoordinateSequenceTest.cpp
index 394db77..968c733 100644
--- a/tests/unit/geom/FixedSizeCoordinateSequenceTest.cpp
+++ b/tests/unit/geom/FixedSizeCoordinateSequenceTest.cpp
@@ -73,7 +73,7 @@ void object::test<4>() {
try {
seq.setOrdinate(0, 17, 5.5);
fail();
- } catch (geos::util::IllegalArgumentException & e) {}
+ } catch (geos::util::IllegalArgumentException &) {}
ensure(seq[0].equals3D(geos::geom::Coordinate{2.2, 3.3, 4.4}));
}
diff --git a/tests/unit/operation/IsSimpleOpTest.cpp b/tests/unit/operation/IsSimpleOpTest.cpp
index 38da4ff..8babefe 100644
--- a/tests/unit/operation/IsSimpleOpTest.cpp
+++ b/tests/unit/operation/IsSimpleOpTest.cpp
@@ -136,7 +136,7 @@ void object::test<4>
try {
g->isSimple();
- } catch (geos::util::GEOSException & e) {
+ } catch (geos::util::GEOSException &) {
// no memory leaks or invalid reads on exception
}
}
commit 59f62c877b01061f2a6cb9a656514aab6ca5ed32
Author: Howard Butler <howard at hobu.co>
Date: Fri Sep 27 09:47:57 2019 -0500
clean up implicit bool conversion
diff --git a/tests/unit/geom/Geometry/normalizeTest.cpp b/tests/unit/geom/Geometry/normalizeTest.cpp
index 7f5ea18..71c02b7 100644
--- a/tests/unit/geom/Geometry/normalizeTest.cpp
+++ b/tests/unit/geom/Geometry/normalizeTest.cpp
@@ -34,9 +34,9 @@ struct test_geometry_normalize_data {
runTest(const char* from, const char* exp)
{
GeomPtr g1(reader.read(from));
- ensure(g1.get());
+ ensure(g1.get() != 0);
GeomPtr g2(g1->clone());
- ensure(g2.get());
+ ensure(g2.get() != 0);
g2->normalize();
GeomPtr ge(reader.read(exp));
diff --git a/tests/unit/triangulate/quadedge/QuadEdgeSubdivisionTest.cpp b/tests/unit/triangulate/quadedge/QuadEdgeSubdivisionTest.cpp
index ec53639..d744203 100644
--- a/tests/unit/triangulate/quadedge/QuadEdgeSubdivisionTest.cpp
+++ b/tests/unit/triangulate/quadedge/QuadEdgeSubdivisionTest.cpp
@@ -147,7 +147,7 @@ template<> template<> void object::test<3>
std::unique_ptr<GeometryCollection> polys = subdiv->getVoronoiDiagram(geomFact);
for(std::size_t i = 0; i < polys->getNumGeometries(); ++i) {
const Polygon* p = dynamic_cast<const Polygon*>(polys->getGeometryN(i));
- ensure(p);
+ ensure(p != nullptr);
std::unique_ptr<CoordinateSequence> cs(
p->getExteriorRing()->getCoordinates()
);
commit d7ea92b4f31ea45f822216a2890c324f69cd719a
Author: Howard Butler <howard at hobu.co>
Date: Fri Sep 27 09:46:54 2019 -0500
clean up more implicit bool conversions
diff --git a/tests/unit/operation/intersection/RectangleIntersectionTest.cpp b/tests/unit/operation/intersection/RectangleIntersectionTest.cpp
index e9280b1..1aef16e 100644
--- a/tests/unit/operation/intersection/RectangleIntersectionTest.cpp
+++ b/tests/unit/operation/intersection/RectangleIntersectionTest.cpp
@@ -72,9 +72,9 @@ struct test_rectangleintersectiontest_data {
doLineClipTest(const char* inputWKT, const std::string& expectedWKT, const Rectangle& rect, double tolerance = 0)
{
GeomPtr g = readWKT(inputWKT);
- ensure(g.get());
+ ensure(g.get() != 0);
GeomPtr obt = RectangleIntersection::clipBoundary(*g, rect);
- ensure(obt.get());
+ ensure(obt.get() != nullptr);
bool ok = isEqual(*readWKT(expectedWKT), *obt, tolerance);
ensure(ok);
}
@@ -83,9 +83,9 @@ struct test_rectangleintersectiontest_data {
doClipTest(const char* inputWKT, const std::string& expectedWKT, const Rectangle& rect, double tolerance = 0)
{
GeomPtr g = readWKT(inputWKT);
- ensure(g.get());
+ ensure(g.get() != nullptr);
GeomPtr obt = RectangleIntersection::clip(*g, rect);
- ensure(obt.get());
+ ensure(obt.get() != nullptr);
bool ok = isEqual(*readWKT(expectedWKT), *obt, tolerance);
ensure(ok);
// Compare with GEOSIntersection output
commit cde5b2caa7edbd3b8bd9cd0916d9079ca6523e7c
Author: Howard Butler <howard at hobu.co>
Date: Fri Sep 27 09:35:40 2019 -0500
clean up many implicit bool conversions in the tests
diff --git a/tests/unit/capi/GEOSClipByRectTest.cpp b/tests/unit/capi/GEOSClipByRectTest.cpp
index fe66fca..e535843 100644
--- a/tests/unit/capi/GEOSClipByRectTest.cpp
+++ b/tests/unit/capi/GEOSClipByRectTest.cpp
@@ -39,7 +39,7 @@ struct test_capigeosclipbyrect_data {
isEqual(GEOSGeom g, const char* exp_wkt)
{
geom3_ = GEOSGeomFromWKT(exp_wkt);
- bool eq = GEOSEquals(geom3_, g);
+ bool eq = GEOSEquals(geom3_, g) != 0;
if(! eq) {
std::printf("EXP: %s\n", exp_wkt);
char* obt_wkt = GEOSWKTWriter_write(w_, g);
diff --git a/tests/unit/capi/GEOSCoordSeqTest.cpp b/tests/unit/capi/GEOSCoordSeqTest.cpp
index e604dd4..05a59f1 100644
--- a/tests/unit/capi/GEOSCoordSeqTest.cpp
+++ b/tests/unit/capi/GEOSCoordSeqTest.cpp
@@ -283,7 +283,7 @@ void object::test<7>
GEOSCoordSeq_setY(cs_, 3, 0);
ensure_equals(GEOSCoordSeq_isCCW(cs_, &ccw), 1);
- ensure(ccw);
+ ensure(ccw != 0);
}
template<>
diff --git a/tests/unit/capi/GEOSDistanceTest.cpp b/tests/unit/capi/GEOSDistanceTest.cpp
index ea6dc74..229ecba 100644
--- a/tests/unit/capi/GEOSDistanceTest.cpp
+++ b/tests/unit/capi/GEOSDistanceTest.cpp
@@ -123,8 +123,8 @@ void object::test<2>
GEOSGeometry* g2 = random_polygon(14, 22, 6, 500);
double d_raw, d_indexed;
- ensure(GEOSDistance(g1, g2, &d_raw));
- ensure(GEOSDistanceIndexed(g1, g2, &d_indexed));
+ ensure(GEOSDistance(g1, g2, &d_raw) != 0);
+ ensure(GEOSDistanceIndexed(g1, g2, &d_indexed) != 0);
ensure_equals(d_indexed, d_raw);
diff --git a/tests/unit/capi/GEOSGeom_extentTest.cpp b/tests/unit/capi/GEOSGeom_extentTest.cpp
index c5681b2..ab29333 100644
--- a/tests/unit/capi/GEOSGeom_extentTest.cpp
+++ b/tests/unit/capi/GEOSGeom_extentTest.cpp
@@ -50,10 +50,10 @@ void object::test<1>
double xmin, ymin, xmax, ymax;
- ensure(GEOSGeom_getXMin(g, &xmin));
- ensure(GEOSGeom_getYMin(g, &ymin));
- ensure(GEOSGeom_getXMax(g, &xmax));
- ensure(GEOSGeom_getYMax(g, &ymax));
+ ensure(GEOSGeom_getXMin(g, &xmin) != 0);
+ ensure(GEOSGeom_getYMin(g, &ymin) != 0);
+ ensure(GEOSGeom_getXMax(g, &xmax) != 0);
+ ensure(GEOSGeom_getYMax(g, &ymax) != 0);
ensure_equals(xmin, -12);
ensure_equals(xmax, 3);
diff --git a/tests/unit/capi/GEOSGeom_setPrecisionTest.cpp b/tests/unit/capi/GEOSGeom_setPrecisionTest.cpp
index 74082e0..68f3220 100644
--- a/tests/unit/capi/GEOSGeom_setPrecisionTest.cpp
+++ b/tests/unit/capi/GEOSGeom_setPrecisionTest.cpp
@@ -38,7 +38,7 @@ struct test_capigeosgeomsetprecision_data {
fromWKT(const char* wkt)
{
GEOSGeometry* g = GEOSGeomFromWKT(wkt);
- ensure(g);
+ ensure(g != 0);
return g;
}
std::string
@@ -92,11 +92,11 @@ void object::test<1>
()
{
geom1_ = fromWKT("POLYGON EMPTY");
- ensure(geom1_);
+ ensure(geom1_ != 0);
double scale = GEOSGeom_getPrecision(geom1_);
ensure_equals(scale, 0.0);
geom3_ = GEOSGeom_setPrecision(geom1_, 2.0, 0);
- ensure(geom3_);
+ ensure(geom3_ != 0);
ensure_equals(toWKT(geom3_), std::string("POLYGON EMPTY"));
scale = GEOSGeom_getPrecision(geom3_);
ensure_equals(scale, 2.0);
@@ -108,9 +108,9 @@ void object::test<2>
()
{
geom1_ = fromWKT("LINESTRING(-3 6, 9 1)");
- ensure(geom1_);
+ ensure(geom1_ != 0);
geom3_ = GEOSGeom_setPrecision(geom1_, 2.0, 0);
- ensure(geom3_);
+ ensure(geom3_ != 0);
ensure_equals(toWKT(geom3_), std::string("LINESTRING (-2 6, 10 2)"));
}
@@ -121,37 +121,37 @@ void object::test<3>
()
{
geom1_ = fromWKT("LINESTRING(2 10, 4 30)");
- ensure(geom1_);
+ ensure(geom1_ != 0);
geom2_ = fromWKT("LINESTRING(4 10, 2 30)");
- ensure(geom2_);
+ ensure(geom2_ != 0);
geom3_ = GEOSIntersection(geom1_, geom2_);
- ensure(geom3_);
+ ensure(geom3_ != 0);
ensure_equals(toWKT(geom3_), std::string("POINT (3 20)"));
GEOSGeometry* g;
// Both inputs with precision grid of 2.0
g = GEOSGeom_setPrecision(geom1_, 2.0, 0);
- ensure(g);
+ ensure(g != 0);
GEOSGeom_destroy(geom1_);
geom1_ = g;
g = GEOSGeom_setPrecision(geom2_, 2.0, 0);
- ensure(g);
+ ensure(g != 0);
GEOSGeom_destroy(geom2_);
geom2_ = g;
GEOSGeom_destroy(geom3_);
geom3_ = GEOSIntersection(geom1_, geom2_);
- ensure(geom3_);
+ ensure(geom3_ != 0);
ensure_equals(toWKT(geom3_), std::string("POINT (4 20)"));
// One input with precision grid of 0.5, the other of 2.0
g = GEOSGeom_setPrecision(geom1_, 0.5, 0);
- ensure(g);
+ ensure(g != 0);
GEOSGeom_destroy(geom1_);
geom1_ = g;
GEOSGeom_destroy(geom3_);
geom3_ = GEOSIntersection(geom1_, geom2_);
- ensure(geom3_);
+ ensure(geom3_ != 0);
ensure_equals(toWKT(geom3_), std::string("POINT (3 20)"));
double scale = GEOSGeom_getPrecision(geom1_);
ensure_equals(scale, 0.5);
@@ -166,7 +166,7 @@ void object::test<4>
()
{
geom1_ = fromWKT("POLYGON((10 10,20 10,16 15,20 20, 10 20, 14 15, 10 10))");
- ensure(geom1_);
+ ensure(geom1_ != 0);
geom2_ = GEOSGeom_setPrecision(geom1_, 5.0, 0);
ensure_equals(toWKT(geom2_), std::string(
"MULTIPOLYGON (((10 10, 15 15, 20 10, 10 10)), ((15 15, 10 20, 20 20, 15 15)))"
@@ -184,7 +184,7 @@ void object::test<5>
()
{
geom1_ = fromWKT("LINESTRING(1 0, 2 0)");
- ensure(geom1_);
+ ensure(geom1_ != 0);
geom2_ = GEOSGeom_setPrecision(geom1_, 5.0, 0);
ensure_equals(toWKT(geom2_), std::string(
"LINESTRING EMPTY"
diff --git a/tests/unit/capi/GEOSMinimumBoundingCircleTest.cpp b/tests/unit/capi/GEOSMinimumBoundingCircleTest.cpp
index 87165c3..156c742 100644
--- a/tests/unit/capi/GEOSMinimumBoundingCircleTest.cpp
+++ b/tests/unit/capi/GEOSMinimumBoundingCircleTest.cpp
@@ -102,7 +102,7 @@ void object::test<2>
// wkt_ = GEOSWKTWriter_write(wktw_, geom2_);
- bool eq = GEOSEqualsExact(geom2_, geom3_, 0.0001);
+ bool eq = GEOSEqualsExact(geom2_, geom3_, 0.0001) != 0;
ensure(eq);
}
@@ -121,7 +121,7 @@ void object::test<3>
// wkt_ = GEOSWKTWriter_write(wktw_, geom2_);
// std::cout << wkt_ << std::endl;
- bool eq = GEOSEqualsExact(geom2_, geom3_, 0.0001);
+ bool eq = GEOSEqualsExact(geom2_, geom3_, 0.0001) != 0;
ensure(eq);
}
@@ -145,10 +145,10 @@ void object::test<4>
// std::cout << wkt_ << std::endl;
bool eq;
- eq = GEOSEqualsExact(geom2_, geom3_, 0.0001);
+ eq = GEOSEqualsExact(geom2_, geom3_, 0.0001) != 0;
ensure(eq);
- eq = GEOSEqualsExact(center, center_expected, 0.0001);
+ eq = GEOSEqualsExact(center, center_expected, 0.0001) != 0;
ensure(eq);
GEOSGeom_destroy(center);
GEOSGeom_destroy(center_expected);
diff --git a/tests/unit/capi/GEOSUnaryUnionTest.cpp b/tests/unit/capi/GEOSUnaryUnionTest.cpp
index 952494e..8ef9c97 100644
--- a/tests/unit/capi/GEOSUnaryUnionTest.cpp
+++ b/tests/unit/capi/GEOSUnaryUnionTest.cpp
@@ -148,7 +148,7 @@ void object::test<5>
GEOSGeometry* expected = GEOSGeomFromWKT("GEOMETRYCOLLECTION (POINT (6 7), LINESTRING (4 -10, 4 5), LINESTRING (4 5, 4 10), LINESTRING (0 5, 4 5), LINESTRING (4 5, 10 5))");
- ensure(GEOSEquals(geom2_, expected));
+ ensure(GEOSEquals(geom2_, expected) != 0);
GEOSGeom_destroy(expected);
}
@@ -184,7 +184,7 @@ void object::test<7>
GEOSGeometry* expected = GEOSGeomFromWKT("GEOMETRYCOLLECTION (LINESTRING (5 7, 7 7), LINESTRING (10 7, 12 7), LINESTRING (5.5 7.5, 6.5 7.5), POLYGON ((10 7, 10 0, 0 0, 0 10, 10 10, 10 7), (5 6, 7 6, 7 7, 7 8, 5 8, 5 7, 5 6)))");
- ensure(GEOSEquals(geom2_, expected));
+ ensure(GEOSEquals(geom2_, expected) != 0);
GEOSGeom_destroy(expected);
}
diff --git a/tests/unit/capi/GEOSVoronoiDiagramTest.cpp b/tests/unit/capi/GEOSVoronoiDiagramTest.cpp
index 59e5204..9bc5ec7 100644
--- a/tests/unit/capi/GEOSVoronoiDiagramTest.cpp
+++ b/tests/unit/capi/GEOSVoronoiDiagramTest.cpp
@@ -49,7 +49,7 @@ struct test_capigeosvoronoidiagram_data {
GEOSNormalize(g);
GEOSNormalize(exp_g);
- bool eq = GEOSEqualsExact(g, exp_g, 1e-10);
+ bool eq = GEOSEqualsExact(g, exp_g, 1e-10) != 0;
if(! eq) {
using namespace std;
char* wkt_exp = GEOSWKTWriter_write(w_, exp_g);
commit 53dd0de31f078ec8d888830ab28c70b18f28a74b
Author: Howard Butler <howard at hobu.co>
Date: Fri Sep 27 09:17:54 2019 -0500
remove unused variables
diff --git a/src/operation/union/OverlapUnion.cpp b/src/operation/union/OverlapUnion.cpp
index b371836..39ab438 100644
--- a/src/operation/union/OverlapUnion.cpp
+++ b/src/operation/union/OverlapUnion.cpp
@@ -111,7 +111,7 @@ OverlapUnion::unionFull(const Geometry* geom0, const Geometry* geom1)
try {
return geom0->Union(geom1);
}
- catch (geos::util::TopologyException & ex) {
+ catch (geos::util::TopologyException &) {
/**
* If the overlay union fails,
* try a buffer union, which often succeeds
diff --git a/src/operation/union/UnaryUnionOp.cpp b/src/operation/union/UnaryUnionOp.cpp
index 073987e..df60a05 100644
--- a/src/operation/union/UnaryUnionOp.cpp
+++ b/src/operation/union/UnaryUnionOp.cpp
@@ -100,7 +100,7 @@ UnaryUnionOp::Union()
try {
auto combinedLines = geomFact->buildGeometry(lines.begin(), lines.end());
unionLines = unionNoOpt(*combinedLines);
- } catch (geos::util::TopologyException & e) {
+ } catch (geos::util::TopologyException &) {
unionLines.reset(CascadedUnion::Union(lines.begin(),
lines.end()));
if(unionLines.get()) {
diff --git a/src/triangulate/quadedge/Vertex.cpp b/src/triangulate/quadedge/Vertex.cpp
index 63d6332..3d8980b 100644
--- a/src/triangulate/quadedge/Vertex.cpp
+++ b/src/triangulate/quadedge/Vertex.cpp
@@ -151,7 +151,7 @@ Vertex::circleCenter(const Vertex& b, const Vertex& c) const
try {
cc.reset(new Vertex(hcc->getX(), hcc->getY()));
}
- catch(NotRepresentableException & nre) {
+ catch(NotRepresentableException &) {
}
return cc;
commit d85c8d5c04e90a54626ecfb7f0e874e2a1287bec
Author: Howard Butler <howard at hobu.co>
Date: Fri Sep 27 09:17:39 2019 -0500
cast type of INSIDE_AREA to match segIndex
diff --git a/src/operation/distance/GeometryLocation.cpp b/src/operation/distance/GeometryLocation.cpp
index 3c343a0..2125c3c 100644
--- a/src/operation/distance/GeometryLocation.cpp
+++ b/src/operation/distance/GeometryLocation.cpp
@@ -46,7 +46,7 @@ GeometryLocation::GeometryLocation(const Geometry* newComponent, const Coordinat
{
component = newComponent;
inside_area = true;
- segIndex = INSIDE_AREA;
+ segIndex = (size_t) INSIDE_AREA;
pt = newPt;
}
commit 13d22074f3ccd7786e5a7eeeab7b07cf34125a4b
Author: Howard Butler <howard at hobu.co>
Date: Fri Sep 27 09:11:53 2019 -0500
intPt is already a member variable. rename local object to ptInt
diff --git a/src/algorithm/LineIntersector.cpp b/src/algorithm/LineIntersector.cpp
index 33f379d..3d631a9 100644
--- a/src/algorithm/LineIntersector.cpp
+++ b/src/algorithm/LineIntersector.cpp
@@ -910,11 +910,11 @@ Coordinate
LineIntersector::intersectionSafe(const Coordinate& p1, const Coordinate& p2,
const Coordinate& q1, const Coordinate& q2) const
{
- Coordinate intPt = Intersection::intersection(p1, p2, q1, q2);
- if (intPt.isNull()) {
- intPt = nearestEndpoint(p1, p2, q1, q2);
+ Coordinate ptInt = Intersection::intersection(p1, p2, q1, q2);
+ if (ptInt.isNull()) {
+ ptInt = nearestEndpoint(p1, p2, q1, q2);
}
- return intPt;
+ return ptInt;
}
-----------------------------------------------------------------------
Summary of changes:
capi/geos_ts_c.cpp | 394 ++++++++++-----------
doc/example.cpp | 30 +-
src/algorithm/LineIntersector.cpp | 8 +-
src/operation/distance/GeometryLocation.cpp | 2 +-
src/operation/union/OverlapUnion.cpp | 2 +-
src/operation/union/UnaryUnionOp.cpp | 2 +-
src/triangulate/quadedge/Vertex.cpp | 2 +-
tests/unit/capi/GEOSClipByRectTest.cpp | 2 +-
tests/unit/capi/GEOSCoordSeqTest.cpp | 2 +-
tests/unit/capi/GEOSDistanceTest.cpp | 4 +-
tests/unit/capi/GEOSGeom_extentTest.cpp | 8 +-
tests/unit/capi/GEOSGeom_setPrecisionTest.cpp | 30 +-
tests/unit/capi/GEOSMinimumBoundingCircleTest.cpp | 8 +-
tests/unit/capi/GEOSUnaryUnionTest.cpp | 4 +-
tests/unit/capi/GEOSVoronoiDiagramTest.cpp | 2 +-
.../geom/CoordinateArraySequenceFactoryTest.cpp | 2 +-
.../unit/geom/FixedSizeCoordinateSequenceTest.cpp | 2 +-
tests/unit/geom/Geometry/normalizeTest.cpp | 4 +-
tests/unit/operation/IsSimpleOpTest.cpp | 2 +-
.../intersection/RectangleIntersectionTest.cpp | 8 +-
.../quadedge/QuadEdgeSubdivisionTest.cpp | 2 +-
21 files changed, 260 insertions(+), 260 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list