[geos-commits] [SCM] GEOS branch master updated. be8b3ffb4532c5302e004a400bf0069493df7302
git at osgeo.org
git at osgeo.org
Mon Sep 10 10:04:18 PDT 2018
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 be8b3ffb4532c5302e004a400bf0069493df7302 (commit)
via 1facc1cc10d123e640a9a77445c117a4e2cce80d (commit)
from 7aa3da4fefd2bafbfdc69c43eec70759e99147b2 (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 be8b3ffb4532c5302e004a400bf0069493df7302
Merge: 7aa3da4 1facc1c
Author: cvvergara <vicky at georepublic.de>
Date: Mon Sep 10 10:04:18 2018 -0700
Merge branch 'fix-shadow4.8' of cvvergara/geos into master
commit 1facc1cc10d123e640a9a77445c117a4e2cce80d
Author: cvvergara <vicky at georepublic.de>
Date: Sun Sep 9 15:19:09 2018 -0500
fixing more shadows
diff --git a/include/geos/geom/Envelope.h b/include/geos/geom/Envelope.h
index d6c0ef4..fa6dec9 100644
--- a/include/geos/geom/Envelope.h
+++ b/include/geos/geom/Envelope.h
@@ -284,7 +284,7 @@ public:
* @param distance the distance to expand the envelope
* @return this envelope
*/
- void expandBy(double distance) { expandBy(distance, distance); }
+ void expandBy(double p_distance) { expandBy(p_distance, p_distance); }
/** \brief
diff --git a/include/geos/geomgraph/GraphComponent.h b/include/geos/geomgraph/GraphComponent.h
index 67af7c0..5790bef 100644
--- a/include/geos/geomgraph/GraphComponent.h
+++ b/include/geos/geomgraph/GraphComponent.h
@@ -58,13 +58,13 @@ public:
const Label& getLabel() const { return label; }
void setLabel(const Label& newLabel) { label = newLabel; }
- virtual void setInResult(bool isInResult) { isInResultVar=isInResult; }
+ virtual void setInResult(bool p_isInResult) { isInResultVar=p_isInResult; }
virtual bool isInResult() const { return isInResultVar; }
virtual void setCovered(bool isCovered);
virtual bool isCovered() const { return isCoveredVar; }
virtual bool isCoveredSet() const { return isCoveredSetVar; }
virtual bool isVisited() const { return isVisitedVar; }
- virtual void setVisited(bool isVisited) { isVisitedVar = isVisited; }
+ virtual void setVisited(bool p_isVisited) { isVisitedVar = p_isVisited; }
virtual bool isIsolated() const=0;
virtual void updateIM(geom::IntersectionMatrix& im);
protected:
diff --git a/include/geos/operation/buffer/BufferParameters.h b/include/geos/operation/buffer/BufferParameters.h
index 0ed6e3c..d80a367 100644
--- a/include/geos/operation/buffer/BufferParameters.h
+++ b/include/geos/operation/buffer/BufferParameters.h
@@ -259,9 +259,9 @@ public:
*
* @param isSingleSided true if a single-sided buffer should be constructed
*/
- void setSingleSided(bool isSingleSided)
+ void setSingleSided(bool p_isSingleSided)
{
- _isSingleSided = isSingleSided;
+ _isSingleSided = p_isSingleSided;
}
/**
diff --git a/include/geos/operation/valid/IsValidOp.h b/include/geos/operation/valid/IsValidOp.h
index f42c9d1..9bcd639 100644
--- a/include/geos/operation/valid/IsValidOp.h
+++ b/include/geos/operation/valid/IsValidOp.h
@@ -264,9 +264,9 @@ public:
*
* @param isValid states whether geometry with this condition is valid
*/
- void setSelfTouchingRingFormingHoleValid(bool isValid)
+ void setSelfTouchingRingFormingHoleValid(bool p_isValid)
{
- isSelfTouchingRingFormingHoleValid = isValid;
+ isSelfTouchingRingFormingHoleValid = p_isValid;
}
};
diff --git a/include/geos/planargraph/GraphComponent.h b/include/geos/planargraph/GraphComponent.h
index d79a47c..ce74610 100644
--- a/include/geos/planargraph/GraphComponent.h
+++ b/include/geos/planargraph/GraphComponent.h
@@ -75,7 +75,7 @@ public:
* Sets the visited flag for this component.
* @param isVisited the desired value of the visited flag
*/
- virtual void setVisited(bool isVisited) { isVisitedVar=isVisited; }
+ virtual void setVisited(bool p_isVisited) { isVisitedVar=p_isVisited; }
/** \brief
* Sets the Visited state for the elements of a container,
@@ -149,7 +149,7 @@ public:
* Sets the marked flag for this component.
* @param isMarked the desired value of the marked flag
*/
- virtual void setMarked(bool isMarked) { isMarkedVar=isMarked; }
+ virtual void setMarked(bool p_isMarked) { isMarkedVar=p_isMarked; }
};
diff --git a/src/algorithm/InteriorPointArea.cpp b/src/algorithm/InteriorPointArea.cpp
index 3a1f6d1..f1938d8 100644
--- a/src/algorithm/InteriorPointArea.cpp
+++ b/src/algorithm/InteriorPointArea.cpp
@@ -204,18 +204,18 @@ InteriorPointArea::widestGeometry(const GeometryCollection* gc) {
if (gc->isEmpty()) {
return gc;
}
- const Geometry* widestGeometry=gc->getGeometryN(0);
+ const Geometry* p_widestGeometry=gc->getGeometryN(0);
// scan remaining geom components to see if any are wider
for(std::size_t i=1, n=gc->getNumGeometries(); i<n; i++) // start at 1
{
const Envelope *env1(gc->getGeometryN(i)->getEnvelopeInternal());
- const Envelope *env2(widestGeometry->getEnvelopeInternal());
+ const Envelope *env2(p_widestGeometry->getEnvelopeInternal());
if (env1->getWidth()>env2->getWidth()) {
- widestGeometry=gc->getGeometryN(i);
+ p_widestGeometry=gc->getGeometryN(i);
}
}
- return widestGeometry;
+ return p_widestGeometry;
}
/* private */
diff --git a/src/geom/CoordinateSequence.cpp b/src/geom/CoordinateSequence.cpp
index c8893dc..76ad269 100644
--- a/src/geom/CoordinateSequence.cpp
+++ b/src/geom/CoordinateSequence.cpp
@@ -38,8 +38,8 @@ static Profiler *profiler = Profiler::instance();
bool
CoordinateSequence::hasRepeatedPoints() const
{
- const std::size_t size=getSize();
- for(std::size_t i=1; i<size; i++) {
+ const std::size_t p_size=getSize();
+ for(std::size_t i=1; i<p_size; i++) {
if (getAt(i-1)==getAt(i)) {
return true;
}
@@ -83,8 +83,8 @@ const Coordinate*
CoordinateSequence::minCoordinate() const
{
const Coordinate* minCoord=nullptr;
- const std::size_t size=getSize();
- for(std::size_t i=0; i<size; i++) {
+ const std::size_t p_size=getSize();
+ for(std::size_t i=0; i<p_size; i++) {
if(minCoord==nullptr || minCoord->compareTo(getAt(i))>0) {
minCoord=&getAt(i);
}
@@ -96,8 +96,8 @@ const Coordinate*
CoordinateSequence::minCoordinate(CoordinateSequence *cl)
{
const Coordinate* minCoord=nullptr;
- const std::size_t size=cl->getSize();
- for(std::size_t i=0;i<size; i++) {
+ const std::size_t p_size=cl->getSize();
+ for(std::size_t i=0;i<p_size; i++) {
if(minCoord==nullptr || minCoord->compareTo(cl->getAt(i))>0) {
minCoord=&(cl->getAt(i));
}
@@ -109,8 +109,8 @@ size_t
CoordinateSequence::indexOf(const Coordinate *coordinate,
const CoordinateSequence *cl)
{
- size_t size = cl->size();
- for (size_t i=0; i < size; ++i)
+ size_t p_size = cl->size();
+ for (size_t i=0; i < p_size; ++i)
{
if ((*coordinate)==cl->getAt(i))
{
@@ -264,8 +264,8 @@ CoordinateSequence::removeRepeatedPoints(const CoordinateSequence *cl)
void
CoordinateSequence::expandEnvelope(Envelope &env) const
{
- const std::size_t size = getSize();
- for (std::size_t i=0; i<size; i++)
+ const std::size_t p_size = getSize();
+ for (std::size_t i=0; i<p_size; i++)
env.expandToInclude(getAt(i));
}
diff --git a/src/geom/Envelope.cpp b/src/geom/Envelope.cpp
index 6df01a9..280d5ea 100644
--- a/src/geom/Envelope.cpp
+++ b/src/geom/Envelope.cpp
@@ -423,11 +423,11 @@ Envelope::split(const string &str, const string &delimiters)
/*public*/
bool
-Envelope::centre(Coordinate& centre) const
+Envelope::centre(Coordinate& p_centre) const
{
if (isNull()) return false;
- centre.x=(getMinX() + getMaxX()) / 2.0;
- centre.y=(getMinY() + getMaxY()) / 2.0;
+ p_centre.x=(getMinX() + getMaxX()) / 2.0;
+ p_centre.y=(getMinY() + getMaxY()) / 2.0;
return true;
}
diff --git a/src/geom/Geometry.cpp b/src/geom/Geometry.cpp
index 07f4fe8..1ceb813 100644
--- a/src/geom/Geometry.cpp
+++ b/src/geom/Geometry.cpp
@@ -478,21 +478,21 @@ Geometry::toText() const
}
Geometry*
-Geometry::buffer(double distance) const
+Geometry::buffer(double p_distance) const
{
- return BufferOp::bufferOp(this, distance);
+ return BufferOp::bufferOp(this, p_distance);
}
Geometry*
-Geometry::buffer(double distance,int quadrantSegments) const
+Geometry::buffer(double p_distance,int quadrantSegments) const
{
- return BufferOp::bufferOp(this, distance, quadrantSegments);
+ return BufferOp::bufferOp(this, p_distance, quadrantSegments);
}
Geometry*
-Geometry::buffer(double distance, int quadrantSegments, int endCapStyle) const
+Geometry::buffer(double p_distance, int quadrantSegments, int endCapStyle) const
{
- return BufferOp::bufferOp(this, distance, quadrantSegments, endCapStyle);
+ return BufferOp::bufferOp(this, p_distance, quadrantSegments, endCapStyle);
}
Geometry*
diff --git a/src/geomgraph/DirectedEdge.cpp b/src/geomgraph/DirectedEdge.cpp
index 0a4bc62..9d091d7 100644
--- a/src/geomgraph/DirectedEdge.cpp
+++ b/src/geomgraph/DirectedEdge.cpp
@@ -144,15 +144,15 @@ DirectedEdge::isLineEdge()
bool
DirectedEdge::isInteriorAreaEdge()
{
- bool isInteriorAreaEdge=true;
+ bool p_isInteriorAreaEdge=true;
for (int i=0; i<2; i++) {
if (!(label.isArea(i)
&& label.getLocation(i,Position::LEFT )==Location::INTERIOR
&& label.getLocation(i,Position::RIGHT)==Location::INTERIOR)) {
- isInteriorAreaEdge=false;
+ p_isInteriorAreaEdge=false;
}
}
- return isInteriorAreaEdge;
+ return p_isInteriorAreaEdge;
}
/*private*/
diff --git a/src/geomgraph/GraphComponent.cpp b/src/geomgraph/GraphComponent.cpp
index e1212cb..f6be97e 100644
--- a/src/geomgraph/GraphComponent.cpp
+++ b/src/geomgraph/GraphComponent.cpp
@@ -52,9 +52,9 @@ GraphComponent::~GraphComponent()
}
void
-GraphComponent::setCovered(bool isCovered)
+GraphComponent::setCovered(bool p_isCovered)
{
- isCoveredVar = isCovered;
+ isCoveredVar = p_isCovered;
isCoveredSetVar = true;
}
diff --git a/src/index/strtree/STRtree.cpp b/src/index/strtree/STRtree.cpp
index 80644b6..80fa3c6 100644
--- a/src/index/strtree/STRtree.cpp
+++ b/src/index/strtree/STRtree.cpp
@@ -132,16 +132,16 @@ STRtree::createParentBoundables(BoundableList* childBoundables, int newLevel)
/*private*/
std::unique_ptr<BoundableList>
-STRtree::createParentBoundablesFromVerticalSlices(std::vector<BoundableList*>* verticalSlices, int newLevel)
+STRtree::createParentBoundablesFromVerticalSlices(std::vector<BoundableList*>* p_verticalSlices, int newLevel)
{
- assert(!verticalSlices->empty());
+ assert(!p_verticalSlices->empty());
std::unique_ptr<BoundableList> parentBoundables( new BoundableList() );
- for (size_t i=0, vssize=verticalSlices->size(); i<vssize; ++i)
+ for (size_t i=0, vssize=p_verticalSlices->size(); i<vssize; ++i)
{
std::unique_ptr<BoundableList> toAdd (
createParentBoundablesFromVerticalSlice(
- (*verticalSlices)[i], newLevel)
+ (*p_verticalSlices)[i], newLevel)
);
assert(!toAdd->empty());
diff --git a/src/noding/snapround/HotPixel.cpp b/src/noding/snapround/HotPixel.cpp
index 2ee9af0..5d1459f 100644
--- a/src/noding/snapround/HotPixel.cpp
+++ b/src/noding/snapround/HotPixel.cpp
@@ -116,12 +116,12 @@ HotPixel::intersectsScaled(const Coordinate& p0,
if (isOutsidePixelEnv) return false;
- bool intersects = intersectsToleranceSquare(p0, p1);
+ bool p_intersects = intersectsToleranceSquare(p0, p1);
// Found bad envelope test
- assert(!(isOutsidePixelEnv && intersects));
+ assert(!(isOutsidePixelEnv && p_intersects));
- return intersects;
+ return p_intersects;
}
/*private*/
diff --git a/src/operation/buffer/BufferInputLineSimplifier.cpp b/src/operation/buffer/BufferInputLineSimplifier.cpp
index 1276a14..4dda5b9 100644
--- a/src/operation/buffer/BufferInputLineSimplifier.cpp
+++ b/src/operation/buffer/BufferInputLineSimplifier.cpp
@@ -205,8 +205,8 @@ BufferInputLineSimplifier::isConcave(const geom::Coordinate& p0,
const geom::Coordinate& p2) const
{
int orientation = CGAlgorithms::computeOrientation(p0, p1, p2);
- bool isConcave = (orientation == angleOrientation);
- return isConcave;
+ bool p_isConcave = (orientation == angleOrientation);
+ return p_isConcave;
}
} // namespace geos.operation.buffer
diff --git a/src/operation/distance/IndexedFacetDistance.cpp b/src/operation/distance/IndexedFacetDistance.cpp
index 31f00d0..8385226 100644
--- a/src/operation/distance/IndexedFacetDistance.cpp
+++ b/src/operation/distance/IndexedFacetDistance.cpp
@@ -48,11 +48,11 @@ namespace geos {
std::pair<const void*, const void*> obj = cachedTree->nearestNeighbour(tree2.get(), dynamic_cast<ItemDistance*>(&itemDistance));
- double distance = static_cast<const FacetSequence*>(obj.first)->distance(*static_cast<const FacetSequence*>(obj.second));
+ double p_distance = static_cast<const FacetSequence*>(obj.first)->distance(*static_cast<const FacetSequence*>(obj.second));
tree2->iterate(deleter);
- return distance;
+ return p_distance;
}
IndexedFacetDistance::~IndexedFacetDistance() {
diff --git a/src/operation/overlay/validate/OverlayResultValidator.cpp b/src/operation/overlay/validate/OverlayResultValidator.cpp
index 46710bc..537442b 100644
--- a/src/operation/overlay/validate/OverlayResultValidator.cpp
+++ b/src/operation/overlay/validate/OverlayResultValidator.cpp
@@ -209,9 +209,9 @@ OverlayResultValidator::isValidResult(OverlayOp::OpCode overlayOp,
bool resultInInterior = (location[2] == Location::INTERIOR);
- bool isValid = ! (expectedInterior ^ resultInInterior);
+ bool p_isValid = ! (expectedInterior ^ resultInInterior);
- return isValid;
+ return p_isValid;
}
/*private static*/
diff --git a/src/operation/polygonize/PolygonizeGraph.cpp b/src/operation/polygonize/PolygonizeGraph.cpp
index c64cb44..ea305b3 100644
--- a/src/operation/polygonize/PolygonizeGraph.cpp
+++ b/src/operation/polygonize/PolygonizeGraph.cpp
@@ -184,15 +184,15 @@ PolygonizeGraph::convertMaximalToMinimalEdgeRings(
i<in; ++i)
{
PolygonizeDirectedEdge *de = ringEdges[i];
- long label=de->getLabel();
- findIntersectionNodes(de, label, intNodes);
+ long p_label=de->getLabel();
+ findIntersectionNodes(de, p_label, intNodes);
// set the next pointers for the edges around each node
for(IntersectionNodes::size_type j=0, jn=intNodes.size();
j<jn; ++j)
{
Node *node=intNodes[j];
- computeNextCCWEdges(node, label);
+ computeNextCCWEdges(node, p_label);
}
intNodes.clear();
diff --git a/src/operation/valid/SweeplineNestedRingTester.cpp b/src/operation/valid/SweeplineNestedRingTester.cpp
index ac1b741..d72821f 100644
--- a/src/operation/valid/SweeplineNestedRingTester.cpp
+++ b/src/operation/valid/SweeplineNestedRingTester.cpp
@@ -85,8 +85,8 @@ SweeplineNestedRingTester::isInside(LinearRing *innerRing,LinearRing *searchRing
// Unable to find a ring point not a node of the search ring
assert(innerRingPt!=nullptr);
- bool isInside=CGAlgorithms::isPointInRing(*innerRingPt,searchRingPts);
- if (isInside) {
+ bool p_isInside=CGAlgorithms::isPointInRing(*innerRingPt,searchRingPts);
+ if (p_isInside) {
/*
* innerRingPt is const just because the input
* CoordinateSequence is const. If the input
diff --git a/tests/unit/tut/tut_exception.hpp b/tests/unit/tut/tut_exception.hpp
index 4120428..2073fb4 100644
--- a/tests/unit/tut/tut_exception.hpp
+++ b/tests/unit/tut/tut_exception.hpp
@@ -188,8 +188,8 @@ struct seh : public tut_error
*/
struct rethrown : public failure
{
- explicit rethrown(const test_result &result)
- : failure(result.message), tr(result)
+ explicit rethrown(const test_result &p_result)
+ : failure(p_result.message), tr(p_result)
{
}
-----------------------------------------------------------------------
Summary of changes:
include/geos/geom/Envelope.h | 2 +-
include/geos/geomgraph/GraphComponent.h | 4 ++--
include/geos/operation/buffer/BufferParameters.h | 4 ++--
include/geos/operation/valid/IsValidOp.h | 4 ++--
include/geos/planargraph/GraphComponent.h | 4 ++--
src/algorithm/InteriorPointArea.cpp | 8 ++++----
src/geom/CoordinateSequence.cpp | 20 ++++++++++----------
src/geom/Envelope.cpp | 6 +++---
src/geom/Geometry.cpp | 12 ++++++------
src/geomgraph/DirectedEdge.cpp | 6 +++---
src/geomgraph/GraphComponent.cpp | 4 ++--
src/index/strtree/STRtree.cpp | 8 ++++----
src/noding/snapround/HotPixel.cpp | 6 +++---
src/operation/buffer/BufferInputLineSimplifier.cpp | 4 ++--
src/operation/distance/IndexedFacetDistance.cpp | 4 ++--
.../overlay/validate/OverlayResultValidator.cpp | 4 ++--
src/operation/polygonize/PolygonizeGraph.cpp | 6 +++---
src/operation/valid/SweeplineNestedRingTester.cpp | 4 ++--
tests/unit/tut/tut_exception.hpp | 4 ++--
19 files changed, 57 insertions(+), 57 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list