[geos-commits] [SCM] GEOS branch 3.9 updated. 082161ef5c34a47178742167fa7025b6ff31ad47
git at osgeo.org
git at osgeo.org
Mon Mar 3 09:26:21 PST 2025
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.9 has been updated
via 082161ef5c34a47178742167fa7025b6ff31ad47 (commit)
from 835d1360220955ca0928f9d8ff9472bbede4ae27 (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 082161ef5c34a47178742167fa7025b6ff31ad47
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Mon Mar 3 09:25:47 2025 -0800
Fix some build issues prior to relesae
diff --git a/NEWS b/NEWS
index 889f00328..cc884c558 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
## Changes in 3.9.6
-xxxx-xx-xx
+2025-03-03
- Bug fixes / improvements:
- Intersection: change to using DoubleDouble computation to improve robustness (GH-937, Martin Davis)
diff --git a/Version.txt b/Version.txt
index b0c752dcc..f8bdd47ac 100644
--- a/Version.txt
+++ b/Version.txt
@@ -5,7 +5,7 @@ GEOS_VERSION_MINOR=9
GEOS_VERSION_PATCH=6
# OPTIONS: "", "dev", "rc1" etc.
-GEOS_PATCH_WORD=dev
+GEOS_PATCH_WORD=
# GEOS CAPI Versions
#
diff --git a/include/geos/algorithm/CGAlgorithmsDD.h b/include/geos/algorithm/CGAlgorithmsDD.h
index df6269675..6efc698ee 100644
--- a/include/geos/algorithm/CGAlgorithmsDD.h
+++ b/include/geos/algorithm/CGAlgorithmsDD.h
@@ -133,8 +133,7 @@ public:
* the circumcentre of an obtuse isosceles triangle lies outside the triangle.
*
* This method uses @ref geos::math::DD extended-precision arithmetic to provide more accurate
- * results than [circumcentre(Coordinate, Coordinate, Coordinate)]
- * (@ref geos::geom::Triangle::circumcentre(const Coordinate& p0, const Coordinate& p1, const Coordinate& p2)).
+ * results than Triangle::circumcentre(Coordinate, Coordinate, Coordinate)
*
* @param a
* a vertex of the triangle
diff --git a/include/geos/io/WKBWriter.h b/include/geos/io/WKBWriter.h
index 48f6beade..fd15f49c9 100644
--- a/include/geos/io/WKBWriter.h
+++ b/include/geos/io/WKBWriter.h
@@ -25,6 +25,7 @@
#include <geos/util/Machine.h> // for getMachineByteOrder
#include <iosfwd>
#include <cstdint>
+#include <cstddef>
// Forward declarations
namespace geos {
@@ -200,7 +201,7 @@ private:
void writeCoordinateSequence(const geom::CoordinateSequence& cs, bool sized);
// throws IOException
- void writeCoordinate(const geom::CoordinateSequence& cs, size_t idx, bool is3d);
+ void writeCoordinate(const geom::CoordinateSequence& cs, std::size_t idx, bool is3d);
// throws IOException
void writeGeometryType(int geometryType, int SRID);
diff --git a/include/geos/operation/distance/IndexedFacetDistance.h b/include/geos/operation/distance/IndexedFacetDistance.h
index 19d7e5ba6..6dd7d65fa 100644
--- a/include/geos/operation/distance/IndexedFacetDistance.h
+++ b/include/geos/operation/distance/IndexedFacetDistance.h
@@ -39,7 +39,7 @@ namespace distance {
/// an repeated query situation.
///
/// Using this technique is usually much more performant than using the
-/// brute-force \ref geom::Geometry::distance(const Geometry* g) const when one
+/// brute-force Geometry::distance(const Geometry* g) const when one
/// or both input geometries are large, or when evaluating many distance
/// computations against a single geometry.
///
diff --git a/include/geos/operation/overlayng/OverlayNG.h b/include/geos/operation/overlayng/OverlayNG.h
index 7fed36bba..c412320f2 100644
--- a/include/geos/operation/overlayng/OverlayNG.h
+++ b/include/geos/operation/overlayng/OverlayNG.h
@@ -271,7 +271,7 @@ public:
* the result of overlaying the geometries using
* a given overlay operation.
*
- * The method handles arguments of {@link Location#NONE} correctly
+ * The method handles arguments of Location::NONE correctly
*/
static bool isResultOfOpPoint(const OverlayLabel* label, int opCode);
@@ -284,7 +284,7 @@ public:
* computed during the overlay process should be
* included in the result geometry.
*
- * The method handles arguments of {@link Location#NONE} correctly.
+ * The method handles arguments of Location::NONE correctly.
*/
static bool isResultOfOp(int overlayOpCode, Location loc0, Location loc1);
diff --git a/include/geos/operation/union/UnaryUnionOp.h b/include/geos/operation/union/UnaryUnionOp.h
index 0ba3de933..e3a3e6fba 100644
--- a/include/geos/operation/union/UnaryUnionOp.h
+++ b/include/geos/operation/union/UnaryUnionOp.h
@@ -73,7 +73,7 @@ namespace geounion { // geos::operation::geounion
* or portions of line segments will be reduced to a single line segment
* in the output.
* This is consistent with the semantics of the
- * [Geometry::Union(Geometry* )](@ref geom::Geometry::Union(const Geometry* other) const)
+ * Geometry::Union(const Geometry* other)
* operation. If **merged** linework is required, the
* [LineMerger](@ref operation::linemerge::LineMerger) class
* can be used.
diff --git a/src/io/WKBWriter.cpp b/src/io/WKBWriter.cpp
index d6bbb7e63..411f98f58 100644
--- a/src/io/WKBWriter.cpp
+++ b/src/io/WKBWriter.cpp
@@ -301,7 +301,7 @@ WKBWriter::writeCoordinateSequence(const CoordinateSequence& cs,
}
void
-WKBWriter::writeCoordinate(const CoordinateSequence& cs, size_t idx,
+WKBWriter::writeCoordinate(const CoordinateSequence& cs, std::size_t idx,
bool is3d)
{
#if DEBUG_WKB_WRITER
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 +-
Version.txt | 2 +-
include/geos/algorithm/CGAlgorithmsDD.h | 3 +--
include/geos/io/WKBWriter.h | 3 ++-
include/geos/operation/distance/IndexedFacetDistance.h | 2 +-
include/geos/operation/overlayng/OverlayNG.h | 4 ++--
include/geos/operation/union/UnaryUnionOp.h | 2 +-
src/io/WKBWriter.cpp | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list