[geos-commits] [SCM] GEOS branch main-relate-ng updated. 1f74a17d41418f67b24cf82dbf551b29918333f2

[git at osgeo.org]

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-relate-ng has been updated
       via  1f74a17d41418f67b24cf82dbf551b29918333f2 (commit)
      from  ec6423c5442a2c23742cc4ec954e8f4cb12b975d (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 1f74a17d41418f67b24cf82dbf551b29918333f2
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Mon Aug 12 16:11:05 2024 -0700

    Fix doxygen mistakes

diff --git a/capi/geos_c.h.in b/capi/geos_c.h.in
index 7eebb1896..77ada433a 100644
--- a/capi/geos_c.h.in
+++ b/capi/geos_c.h.in
@@ -5209,8 +5209,7 @@ extern char GEOS_DLL GEOSPreparedWithin(
 * true if the patterns are consistent and false otherwise.
 * \param pg1 The prepared geometry
 * \param g2 The geometry to test
-* \param pat The DE9IM pattern to test
-* \returns 1 on true, 0 on false, 2 on exception
+* \returns The DE9IM relate pattern string
 * \see GEOSPrepare
 * \see GEOSRelate
 * \see GEOSPreparedRelatePattern
@@ -5227,7 +5226,8 @@ extern char GEOS_DLL * GEOSPreparedRelate(
 * prepared and provided geometry.
 * \param pg1 The prepared geometry
 * \param g2 The geometry to test
-* \returns The DE9IM relate pattern string
+* \param pat The DE9IM pattern to test
+* \returns 1 on true, 0 on false, 2 on exception
 * \see GEOSPrepare
 * \see GEOSRelatePattern
 * \see GEOSPreparedRelate
diff --git a/include/geos/geom/prep/PreparedGeometry.h b/include/geos/geom/prep/PreparedGeometry.h
index cdb8c777c..600fca3b0 100644
--- a/include/geos/geom/prep/PreparedGeometry.h
+++ b/include/geos/geom/prep/PreparedGeometry.h
@@ -236,7 +236,7 @@ public:
      * @param geom the Geometry to test the
      * @return the DE9IM matrix
      */
-    virtual std::unique_ptr<IntersectionMatrix> relate(const geom::Geometry* g) const = 0;
+    virtual std::unique_ptr<IntersectionMatrix> relate(const geom::Geometry* geom) const = 0;
 
     /** \brief
      * Compares the prepared geometry to the given geometry
@@ -248,7 +248,7 @@ public:
      * @param pat the DE9IM pattern
      * @return true if the patterns are consistent
      */
-    virtual bool relate(const geom::Geometry* g, const std::string& pat) const = 0;
+    virtual bool relate(const geom::Geometry* geom, const std::string& pat) const = 0;
 
 };
 

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

Summary of changes:
 capi/geos_c.h.in                          | 6 +++---
 include/geos/geom/prep/PreparedGeometry.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GEOS