[geos-commits] [SCM] GEOS branch main-perf-ng updated. e01c69fa9bed5b53642e6e1b622021d3087751fb

git at osgeo.org git at osgeo.org
Wed Aug 14 15:00:39 PDT 2024


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, main-perf-ng has been updated
       via  e01c69fa9bed5b53642e6e1b622021d3087751fb (commit)
      from  4b5e1cd52310c1950a24542f6d5802f73b312f3c (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 e01c69fa9bed5b53642e6e1b622021d3087751fb
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Wed Aug 14 15:00:10 2024 -0700

    Move some accessors into header

diff --git a/include/geos/operation/relateng/RelateGeometry.h b/include/geos/operation/relateng/RelateGeometry.h
index bf6b15377..df0277d19 100644
--- a/include/geos/operation/relateng/RelateGeometry.h
+++ b/include/geos/operation/relateng/RelateGeometry.h
@@ -148,15 +148,30 @@ public:
 
     static std::string name(bool isA);
 
-    const Geometry* getGeometry() const;
+    const Geometry* getGeometry() const {
+        return geom;
+    }
 
-    bool isPrepared() const;
+    bool isPrepared() const {
+        return m_isPrepared;
+    }
 
-    const Envelope* getEnvelope() const;
+    const Envelope* getEnvelope() const {
+        return geomEnv;
+    }
 
-    int getDimension() const;
+    int getDimension() const {
+        return geomDim;
+    }
 
-    bool hasDimension(int dim) const;
+    bool hasDimension(int dim) const {
+        switch (dim) {
+            case Dimension::P: return hasPoints;
+            case Dimension::L: return hasLines;
+            case Dimension::A: return hasAreas;
+        }
+        return false;
+    }
 
     /**
     * Gets the actual non-empty dimension of the geometry.
diff --git a/src/operation/relateng/RelateGeometry.cpp b/src/operation/relateng/RelateGeometry.cpp
index cb4a93b52..8a9620053 100644
--- a/src/operation/relateng/RelateGeometry.cpp
+++ b/src/operation/relateng/RelateGeometry.cpp
@@ -154,47 +154,6 @@ RelateGeometry::isZeroLength(const LineString* line) {
 }
 
 
-/* public */
-const Geometry*
-RelateGeometry::getGeometry() const
-{
-    return geom;
-}
-
-/* public */
-bool
-RelateGeometry::isPrepared() const
-{
-    return m_isPrepared;
-}
-
-/* public */
-const Envelope*
-RelateGeometry::getEnvelope() const
-{
-    return geomEnv;
-}
-
-/* public */
-int
-RelateGeometry::getDimension() const
-{
-    return geomDim;
-}
-
-/* public */
-bool
-RelateGeometry::hasDimension(int dim) const
-{
-    switch (dim) {
-        case Dimension::P: return hasPoints;
-        case Dimension::L: return hasLines;
-        case Dimension::A: return hasAreas;
-    }
-    return false;
-}
-
-
 /* public */
 int
 RelateGeometry::getDimensionReal() const
@@ -210,6 +169,7 @@ RelateGeometry::getDimensionReal() const
     return Dimension::P;
 }
 
+
 /* public */
 bool
 RelateGeometry::hasEdges() const

-----------------------------------------------------------------------

Summary of changes:
 include/geos/operation/relateng/RelateGeometry.h | 33 ++++++++++++++-----
 src/operation/relateng/RelateGeometry.cpp        | 42 +-----------------------
 2 files changed, 25 insertions(+), 50 deletions(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list