[geos-commits] [SCM] GEOS branch svn-3.5 updated. eefdcbc4abcb6ef8dab79c397cb8575db2f74bee
git at osgeo.org
git at osgeo.org
Mon Jan 28 12:23:28 PST 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, svn-3.5 has been updated
via eefdcbc4abcb6ef8dab79c397cb8575db2f74bee (commit)
from e8f4aec65e8e299004e422fb9639457fb40f37ff (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 eefdcbc4abcb6ef8dab79c397cb8575db2f74bee
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Mon Jan 28 12:23:17 2019 -0800
Remove use of nullptr
diff --git a/src/operation/overlay/PolygonBuilder.cpp b/src/operation/overlay/PolygonBuilder.cpp
index f9cb11a..97dd440 100644
--- a/src/operation/overlay/PolygonBuilder.cpp
+++ b/src/operation/overlay/PolygonBuilder.cpp
@@ -332,7 +332,7 @@ PolygonBuilder::findEdgeRingContaining(EdgeRing *testEr,
LinearRing *testRing = testEr->getLinearRing();
const Envelope *testEnv = testRing->getEnvelopeInternal();
EdgeRing *minShell = NULL;
- const Envelope *minShellEnv = nullptr;
+ const Envelope *minShellEnv = NULL;
for(size_t i = 0, n = newShellList.size(); i<n; i++) {
EdgeRing *tryShell = newShellList[i];
@@ -354,7 +354,7 @@ PolygonBuilder::findEdgeRingContaining(EdgeRing *testEr,
// check if this new containing ring is smaller than
// the current minimum ring
if (isContained) {
- if (minShell==nullptr ||
+ if (minShell==NULL ||
minShellEnv->contains(tryShellEnv)) {
minShell = tryShell;
minShellEnv = minShell->getLinearRing()->getEnvelopeInternal();
-----------------------------------------------------------------------
Summary of changes:
src/operation/overlay/PolygonBuilder.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list