[geos-commits] [SCM] GEOS branch 3.12 updated. 582dcac1c352f325629319759ed9ac7532f6c8ec
git at osgeo.org
git at osgeo.org
Tue Sep 5 19:14:16 PDT 2023
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, 3.12 has been updated
via 582dcac1c352f325629319759ed9ac7532f6c8ec (commit)
from 4af2a56bc7fb93bdc6567b8eb3bf184c04f73cb9 (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 582dcac1c352f325629319759ed9ac7532f6c8ec
Author: Martin Davis <mtnclimb at gmail.com>
Date: Tue Sep 5 18:42:05 2023 -0700
Add const decls to IncrementalDelanayTriangulator
diff --git a/include/geos/triangulate/IncrementalDelaunayTriangulator.h b/include/geos/triangulate/IncrementalDelaunayTriangulator.h
index 942d62d33..0d22412da 100644
--- a/include/geos/triangulate/IncrementalDelaunayTriangulator.h
+++ b/include/geos/triangulate/IncrementalDelaunayTriangulator.h
@@ -94,11 +94,11 @@ public:
private:
- bool isConcaveBoundary(const quadedge::QuadEdge& e);
+ bool isConcaveBoundary(const quadedge::QuadEdge& e) const;
- bool isConcaveAtOrigin(const quadedge::QuadEdge& e);
+ bool isConcaveAtOrigin(const quadedge::QuadEdge& e) const;
- bool isBetweenFrameAndInserted(const quadedge::QuadEdge& e, const quadedge::Vertex& vInsert);
+ bool isBetweenFrameAndInserted(const quadedge::QuadEdge& e, const quadedge::Vertex& vInsert) const;
};
} //namespace geos.triangulate
diff --git a/src/triangulate/IncrementalDelaunayTriangulator.cpp b/src/triangulate/IncrementalDelaunayTriangulator.cpp
index a742b7ee1..36acaf88f 100644
--- a/src/triangulate/IncrementalDelaunayTriangulator.cpp
+++ b/src/triangulate/IncrementalDelaunayTriangulator.cpp
@@ -131,7 +131,7 @@ IncrementalDelaunayTriangulator::insertSite(const Vertex& v)
}
bool
-IncrementalDelaunayTriangulator::isConcaveBoundary(const QuadEdge& e)
+IncrementalDelaunayTriangulator::isConcaveBoundary(const QuadEdge& e) const
{
if (subdiv->isFrameVertex(e.dest())) {
return isConcaveAtOrigin(e);
@@ -143,20 +143,20 @@ IncrementalDelaunayTriangulator::isConcaveBoundary(const QuadEdge& e)
}
bool
-IncrementalDelaunayTriangulator::isConcaveAtOrigin(const QuadEdge& e)
+IncrementalDelaunayTriangulator::isConcaveAtOrigin(const QuadEdge& e) const
{
- Coordinate p = e.orig().getCoordinate();
- Coordinate pp = e.oPrev().dest().getCoordinate();
- Coordinate pn = e.oNext().dest().getCoordinate();
+ const Coordinate& p = e.orig().getCoordinate();
+ const Coordinate& pp = e.oPrev().dest().getCoordinate();
+ const Coordinate& pn = e.oNext().dest().getCoordinate();
bool isConcave = Orientation::COUNTERCLOCKWISE == Orientation::index(pp, pn, p);
return isConcave;
}
bool
-IncrementalDelaunayTriangulator::isBetweenFrameAndInserted(const QuadEdge& e, const Vertex& vInsert)
+IncrementalDelaunayTriangulator::isBetweenFrameAndInserted(const QuadEdge& e, const Vertex& vInsert) const
{
- const Vertex v1 = e.oNext().dest();
- const Vertex v2 = e.oPrev().dest();
+ const Vertex& v1 = e.oNext().dest();
+ const Vertex& v2 = e.oPrev().dest();
return (v1.getCoordinate() == vInsert.getCoordinate() && subdiv->isFrameVertex(v2))
|| (v2.getCoordinate() == vInsert.getCoordinate() && subdiv->isFrameVertex(v1));
}
-----------------------------------------------------------------------
Summary of changes:
.../geos/triangulate/IncrementalDelaunayTriangulator.h | 6 +++---
src/triangulate/IncrementalDelaunayTriangulator.cpp | 16 ++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list