Skip to content

Commit 082161e

Browse files
committed
Fix some build issues prior to relesae
1 parent 835d136 commit 082161e

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

NEWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Changes in 3.9.6
2-
xxxx-xx-xx
2+
2025-03-03
33

44
- Bug fixes / improvements:
55
- Intersection: change to using DoubleDouble computation to improve robustness (GH-937, Martin Davis)

Version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ GEOS_VERSION_MINOR=9
55
GEOS_VERSION_PATCH=6
66

77
# OPTIONS: "", "dev", "rc1" etc.
8-
GEOS_PATCH_WORD=dev
8+
GEOS_PATCH_WORD=
99

1010
# GEOS CAPI Versions
1111
#

include/geos/algorithm/CGAlgorithmsDD.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,7 @@ class GEOS_DLL CGAlgorithmsDD {
133133
* the circumcentre of an obtuse isosceles triangle lies outside the triangle.
134134
*
135135
* This method uses @ref geos::math::DD extended-precision arithmetic to provide more accurate
136-
* results than [circumcentre(Coordinate, Coordinate, Coordinate)]
137-
* (@ref geos::geom::Triangle::circumcentre(const Coordinate& p0, const Coordinate& p1, const Coordinate& p2)).
136+
* results than Triangle::circumcentre(Coordinate, Coordinate, Coordinate)
138137
*
139138
* @param a
140139
* a vertex of the triangle

include/geos/io/WKBWriter.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <geos/util/Machine.h> // for getMachineByteOrder
2626
#include <iosfwd>
2727
#include <cstdint>
28+
#include <cstddef>
2829

2930
// Forward declarations
3031
namespace geos {
@@ -200,7 +201,7 @@ class GEOS_DLL WKBWriter {
200201
void writeCoordinateSequence(const geom::CoordinateSequence& cs, bool sized);
201202
// throws IOException
202203

203-
void writeCoordinate(const geom::CoordinateSequence& cs, size_t idx, bool is3d);
204+
void writeCoordinate(const geom::CoordinateSequence& cs, std::size_t idx, bool is3d);
204205
// throws IOException
205206

206207
void writeGeometryType(int geometryType, int SRID);

include/geos/operation/distance/IndexedFacetDistance.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace distance {
3939
/// an repeated query situation.
4040
///
4141
/// Using this technique is usually much more performant than using the
42-
/// brute-force \ref geom::Geometry::distance(const Geometry* g) const when one
42+
/// brute-force Geometry::distance(const Geometry* g) const when one
4343
/// or both input geometries are large, or when evaluating many distance
4444
/// computations against a single geometry.
4545
///

include/geos/operation/overlayng/OverlayNG.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ class GEOS_DLL OverlayNG {
271271
* the result of overlaying the geometries using
272272
* a given overlay operation.
273273
*
274-
* The method handles arguments of {@link Location#NONE} correctly
274+
* The method handles arguments of Location::NONE correctly
275275
*/
276276
static bool isResultOfOpPoint(const OverlayLabel* label, int opCode);
277277

@@ -284,7 +284,7 @@ class GEOS_DLL OverlayNG {
284284
* computed during the overlay process should be
285285
* included in the result geometry.
286286
*
287-
* The method handles arguments of {@link Location#NONE} correctly.
287+
* The method handles arguments of Location::NONE correctly.
288288
*/
289289
static bool isResultOfOp(int overlayOpCode, Location loc0, Location loc1);
290290

include/geos/operation/union/UnaryUnionOp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ namespace geounion { // geos::operation::geounion
7373
* or portions of line segments will be reduced to a single line segment
7474
* in the output.
7575
* This is consistent with the semantics of the
76-
* [Geometry::Union(Geometry* )](@ref geom::Geometry::Union(const Geometry* other) const)
76+
* Geometry::Union(const Geometry* other)
7777
* operation. If **merged** linework is required, the
7878
* [LineMerger](@ref operation::linemerge::LineMerger) class
7979
* can be used.

src/io/WKBWriter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ WKBWriter::writeCoordinateSequence(const CoordinateSequence& cs,
301301
}
302302

303303
void
304-
WKBWriter::writeCoordinate(const CoordinateSequence& cs, size_t idx,
304+
WKBWriter::writeCoordinate(const CoordinateSequence& cs, std::size_t idx,
305305
bool is3d)
306306
{
307307
#if DEBUG_WKB_WRITER

0 commit comments

Comments
 (0)