[geos-commits] [SCM] GEOS branch 3.10 updated. 9bce2b07eb80a8de3d2d763a91b9af40d50dc36d
git at osgeo.org
git at osgeo.org
Fri Feb 21 15:29:50 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.10 has been updated
via 9bce2b07eb80a8de3d2d763a91b9af40d50dc36d (commit)
from 24610d655ef8c3f5bb4f973f9dec097a3a583609 (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 9bce2b07eb80a8de3d2d763a91b9af40d50dc36d
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Fri Feb 21 15:29:01 2025 -0800
Update CI for Ubunto 20.04 deprecation
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1e952f86e..b58f80572 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,6 +13,7 @@ jobs:
linux:
name: 'Linux'
strategy:
+ fail-fast: false
matrix:
ci:
- {
@@ -24,61 +25,34 @@ jobs:
cmake: 3.15.*,
os: ubuntu-latest
}
- # - {
- # compiler: g++,
- # build_type: Release,
- # cxxstd: 11,
- # arch: 32,
- # packages: 'g++-4.8-multilib gcc-4.8-multilib g++-multilib gcc-multilib',
- # cmake: 3.13.*,
- # os: ubuntu-18.04
- # }
- {
- compiler: clang++,
- build_type: Release,
- cxxstd: 11,
- arch: 64,
- packages: 'clang',
- cmake: 3.17.*,
- os: ubuntu-latest
- }
- - {
- compiler: clang++,
- build_type: Release,
- cxxstd: 11,
- arch: 64,
- packages: 'clang',
- cmake: 3.17.*,
- os: ubuntu-latest
- }
- - {
- compiler: clang++,
- build_type: Release,
- cxxstd: 11,
- arch: 64,
- packages: 'g++',
- cmake: 3.17.*,
- cmake_extra: '-DDISABLE_GEOS_INLINE=ON',
- os: ubuntu-latest
- }
- - {
- compiler: clang++,
+ compiler: g++,
build_type: Debug,
cxxstd: 11,
arch: 64,
- packages: 'clang',
- cmake: 3.17.*,
- os: ubuntu-20.04,
+ packages: 'g++',
+ cmake: 3.15.*,
+ os: ubuntu-latest
}
- {
compiler: clang++,
build_type: Release,
- cxxstd: 14,
+ cxxstd: 11,
arch: 64,
packages: 'clang',
cmake: 3.17.*,
os: ubuntu-latest
}
+ - {
+ compiler: clang++,
+ build_type: Release,
+ cxxstd: 11,
+ arch: 64,
+ packages: 'clang',
+ cmake: 3.17.*,
+ cmake_extra: '-DDISABLE_GEOS_INLINE=ON',
+ os: ubuntu-latest
+ }
runs-on: ${{ matrix.ci.os }}
steps:
@@ -128,7 +102,7 @@ jobs:
- name: 'Upload Valgrind Log'
if: failure()
- uses: actions/upload-artifact at v2
+ uses: actions/upload-artifact at v4
with:
name: valgrind-log
path: build.cmake/Testing/Temporary/MemoryChecker.**.log
diff --git a/include/geos/algorithm/CGAlgorithmsDD.h b/include/geos/algorithm/CGAlgorithmsDD.h
index 8bab435ba..ada465279 100644
--- a/include/geos/algorithm/CGAlgorithmsDD.h
+++ b/include/geos/algorithm/CGAlgorithmsDD.h
@@ -134,8 +134,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 circumcentre(Coordinate, Coordinate, Coordinate)
*
* @param a
* a vertex of the triangle
diff --git a/include/geos/noding/SegmentNodeList.h b/include/geos/noding/SegmentNodeList.h
index d3644ac19..800aa6529 100644
--- a/include/geos/noding/SegmentNodeList.h
+++ b/include/geos/noding/SegmentNodeList.h
@@ -157,9 +157,6 @@ public:
* Adds an intersection into the list, if it isn't already there.
* The input segmentIndex is expected to be normalized.
*
- * @return the SegmentIntersection found or added. It will be
- * destroyed at SegmentNodeList destruction time.
- *
* @param intPt the intersection Coordinate, will be copied
* @param segmentIndex
*/
diff --git a/include/geos/operation/distance/IndexedFacetDistance.h b/include/geos/operation/distance/IndexedFacetDistance.h
index bd4e23f99..db12a1331 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 geom::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..fcad983be 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 eb1bfe8ee..ade73841b 100644
--- a/include/geos/operation/union/UnaryUnionOp.h
+++ b/include/geos/operation/union/UnaryUnionOp.h
@@ -72,9 +72,9 @@ 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(Geometry* ) geom::Geometry::Union(const Geometry* other) const
* operation. If **merged** linework is required, the
- * [LineMerger](@ref operation::linemerge::LineMerger) class
+ * operation::linemerge::LineMerger class
* can be used.
* - Unioning a set of [Points](@ref geom::Point) has the effect of merging
* all identical points (producing a set with no duplicates).
diff --git a/include/geos/triangulate/polygon/PolygonEarClipper.h b/include/geos/triangulate/polygon/PolygonEarClipper.h
index 3a9089c60..a9d88512b 100644
--- a/include/geos/triangulate/polygon/PolygonEarClipper.h
+++ b/include/geos/triangulate/polygon/PolygonEarClipper.h
@@ -186,7 +186,6 @@ public:
*
* @param polyShell the vertices of the polygon
* @param triListResult vector to fill in with the resultant Tri s
- * @return a list of the Tris
*/
static void triangulate(std::vector<Coordinate>& polyShell, TriList& triListResult);
diff --git a/include/geos/triangulate/polygon/VertexSequencePackedRtree.h b/include/geos/triangulate/polygon/VertexSequencePackedRtree.h
index 616b2ba72..984e586aa 100644
--- a/include/geos/triangulate/polygon/VertexSequencePackedRtree.h
+++ b/include/geos/triangulate/polygon/VertexSequencePackedRtree.h
@@ -137,7 +137,6 @@ public:
*
* @param queryEnv the query extent
* @param result vector to fill with results
- * @return
*/
void query(const Envelope& queryEnv, std::vector<std::size_t>& result) const;
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/ci.yml | 40 ++++------------------
include/geos/algorithm/CGAlgorithmsDD.h | 3 +-
include/geos/noding/SegmentNodeList.h | 3 --
.../geos/operation/distance/IndexedFacetDistance.h | 2 +-
include/geos/operation/overlayng/OverlayNG.h | 4 +--
include/geos/operation/union/UnaryUnionOp.h | 4 +--
.../geos/triangulate/polygon/PolygonEarClipper.h | 1 -
.../polygon/VertexSequencePackedRtree.h | 1 -
8 files changed, 13 insertions(+), 45 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list