[Git][debian-gis-team/geos][upstream] New upstream version 3.10.0~rc1
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Wed Oct 13 05:36:57 BST 2021
Bas Couwenberg pushed to branch upstream at Debian GIS Project / geos
Commits:
fa1f9145 by Bas Couwenberg at 2021-10-13T05:51:08+02:00
New upstream version 3.10.0~rc1
- - - - -
14 changed files:
- CMakeLists.txt
- NEWS
- Version.txt
- capi/geos_c.h.in
- include/geos/algorithm/CGAlgorithmsDD.h
- include/geos/operation/overlayng/Edge.h
- include/geos/operation/overlayng/EdgeSourceInfo.h
- include/geos/operation/valid/IsSimpleOp.h
- src/algorithm/CGAlgorithmsDD.cpp
- src/deps/CMakeLists.txt
- src/noding/NodingIntersectionFinder.cpp
- src/operation/overlayng/OverlayLabel.cpp
- + tests/xmltester/tests/robust/overlay/TestOverlay-pg-4738.xml
- tools/CMakeLists.txt
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -48,7 +48,7 @@ option(BUILD_SHARED_LIBS "Build GEOS with shared libraries" ON)
set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard version to use (default is 11)")
## GEOS custom variables
-option(BUILD_BENCHMARKS "Build GEOS benchmarks" ON)
+option(BUILD_BENCHMARKS "Build GEOS benchmarks" OFF)
cmake_dependent_option(GEOS_BUILD_DEVELOPER
"Build with compilation flags useful for development" ON
"GEOS_BUILD_FROM_GIT" OFF)
=====================================
NEWS
=====================================
@@ -33,6 +33,10 @@ Changes in 3.10.0
- Fix DiscreteFrechetDistance to use initial points of input lines (#1128, Martin Davis)
- Changes:
+ - Autoconf build system is dropped in favour of CMake
+ See README.md and INSTALL.md for examples of usage
+ - Libtool is no longer used for in favour of CMake
+ Therefor libgeos.la is no longer built/installed
- #1094, #1090: Drop inlines.cpp to address duplicate symbols on many platforms
(Regina Obe)
- GH475: Do not return NaN from GEOSProjectNormalized_r (Paul Ramsey)
=====================================
Version.txt
=====================================
@@ -5,7 +5,7 @@ GEOS_VERSION_MINOR=10
GEOS_VERSION_PATCH=0
# OPTIONS: "", "dev", "rc1" etc.
-GEOS_PATCH_WORD=beta3
+GEOS_PATCH_WORD=rc1
# GEOS CAPI Versions
#
=====================================
capi/geos_c.h.in
=====================================
@@ -1380,7 +1380,7 @@ extern int GEOS_DLL GEOSNormalize_r(
GEOSGeometry* g);
/**
-* Controls the behavior of GEOSGeometry_setPrecision()
+* Controls the behavior of GEOSGeom_setPrecision()
* when altering the precision of a geometry.
*/
enum GEOSPrecisionRules {
@@ -1813,9 +1813,9 @@ extern GEOSGeoJSONWriter GEOS_DLL *GEOSGeoJSONWriter_create_r(
/** \see GEOSGeoJSONWriter_destroy */
extern void GEOS_DLL GEOSGeoJSONWriter_destroy_r(GEOSContextHandle_t handle,
- GEOSGeoJSONWriter* reader);
+ GEOSGeoJSONWriter* writer);
-/** \see GEOSWKTWriter_write */
+/** \see GEOSGeoJSONWriter_writeGeometry */
extern char GEOS_DLL *GEOSGeoJSONWriter_writeGeometry_r(
GEOSContextHandle_t handle,
GEOSGeoJSONWriter* writer,
@@ -3764,7 +3764,7 @@ extern int GEOS_DLL GEOSNormalize(GEOSGeometry* g);
* or 0 for FLOATING precision
* \param flags The bitwise OR of members of the \ref GEOSPrecisionRules enum
* \return The precision reduced result.
-* Caller must free with GEOSGeometry_destroy()
+* Caller must free with GEOSGeom_destroy()
* NULL on exception.
*/
extern GEOSGeometry GEOS_DLL *GEOSGeom_setPrecision(
@@ -3929,7 +3929,7 @@ extern int GEOS_DLL GEOSGeom_getYMax(const GEOSGeometry* g, double* value);
* \param g Input geometry, must be a LineString
* \param n Index of desired point (zero based)
* \return A Point geometry.
-* Caller must free with GEOSGeometry_destroy()
+* Caller must free with GEOSGeom_destroy()
* NULL on exception.
*/
extern GEOSGeometry GEOS_DLL *GEOSGeomGetPointN(const GEOSGeometry *g, int n);
@@ -3938,7 +3938,7 @@ extern GEOSGeometry GEOS_DLL *GEOSGeomGetPointN(const GEOSGeometry *g, int n);
* Return the first point of a LineString
* \param g Input geometry, must be a LineString
* \return A Point geometry.
-* Caller must free with GEOSGeometry_destroy()
+* Caller must free with GEOSGeom_destroy()
* NULL on exception.
*/
extern GEOSGeometry GEOS_DLL *GEOSGeomGetStartPoint(const GEOSGeometry *g);
@@ -3947,7 +3947,7 @@ extern GEOSGeometry GEOS_DLL *GEOSGeomGetStartPoint(const GEOSGeometry *g);
* Return the last point of a LineString
* \param g Input geometry, must be a LineString
* \return A Point geometry.
-* Caller must free with GEOSGeometry_destroy()
+* Caller must free with GEOSGeom_destroy()
* NULL on exception.
*/
extern GEOSGeometry GEOS_DLL *GEOSGeomGetEndPoint(const GEOSGeometry *g);
@@ -4152,7 +4152,7 @@ extern void GEOS_DLL GEOSWKTReader_destroy(GEOSWKTReader* reader);
* a geometry, and return an allocated geometry.
* \param reader A WKT reader object, caller retains ownership
* \param wkt The WKT string to parse, caller retains ownership
-* \return A \ref GEOSGeometry, caller to free with GEOSGeometry_destroy())
+* \return A \ref GEOSGeometry, caller to free with GEOSGeom_destroy())
*/
extern GEOSGeometry GEOS_DLL *GEOSWKTReader_read(
GEOSWKTReader* reader,
@@ -4425,7 +4425,7 @@ extern void GEOS_DLL GEOSGeoJSONReader_destroy(GEOSGeoJSONReader* reader);
* geometrycollection. Feature properties are not read.
* \param reader A GeoJSON reader object, caller retains ownership
* \param geojson The json string to parse, caller retains ownership
-* \return A \ref GEOSGeometry, caller to free with GEOSGeometry_destroy())
+* \return A \ref GEOSGeometry, caller to free with GEOSGeom_destroy())
*/
extern GEOSGeometry GEOS_DLL *GEOSGeoJSONReader_readGeometry(
GEOSGeoJSONReader* reader,
=====================================
include/geos/algorithm/CGAlgorithmsDD.h
=====================================
@@ -16,8 +16,8 @@
*
**********************************************************************/
-#ifndef GEOS_ALGORITHM_CGALGORITHMDD_H
-#define GEOS_ALGORITHM_CGALGORITHMDD_H
+#pragma once
+
#include <geos/export.h>
#include <geos/inline.h>
#include <geos/math/DD.h>
@@ -157,7 +157,6 @@ protected:
} // namespace geos
#ifdef GEOS_INLINE
-#include "geos/algorithm/CGAlgorithmsDD.inl"
+# include "geos/algorithm/CGAlgorithmsDD.inl"
#endif
-#endif // GEOS_ALGORITHM_CGALGORITHM_H
=====================================
include/geos/operation/overlayng/Edge.h
=====================================
@@ -17,6 +17,7 @@
#include <geos/inline.h>
#include <geos/operation/overlayng/OverlayLabel.h>
#include <geos/geom/Coordinate.h>
+#include <geos/geom/CoordinateSequence.h>
#include <geos/export.h>
#include <memory>
@@ -25,7 +26,6 @@
namespace geos {
namespace geom {
class Coordinate;
-class CoordinateSequence;
}
namespace operation {
namespace overlayng {
=====================================
include/geos/operation/overlayng/EdgeSourceInfo.h
=====================================
@@ -16,7 +16,7 @@
#include <geos/geom/Dimension.h>
#include <geos/export.h>
-
+#include <cstdint>
namespace geos { // geos.
namespace operation { // geos.operation
=====================================
include/geos/operation/valid/IsSimpleOp.h
=====================================
@@ -17,6 +17,8 @@
#pragma once
+#include <memory>
+
#include <geos/algorithm/LineIntersector.h>
#include <geos/algorithm/BoundaryNodeRule.h>
#include <geos/noding/SegmentIntersector.h>
=====================================
src/algorithm/CGAlgorithmsDD.cpp
=====================================
@@ -188,11 +188,10 @@ CGAlgorithmsDD::detDD(const DD& x1, const DD& y1, const DD& x2, const DD& y2)
return (x1 * y2) - (y1 * x2);
}
-#ifndef GEOS_INLINE
-#include "geos/algorithm/CGAlgorithmsDD.inl"
-#endif
-
} // namespace geos::algorithm
} // namespace geos
+#ifndef GEOS_INLINE
+# include "geos/algorithm/CGAlgorithmsDD.inl"
+#endif
=====================================
src/deps/CMakeLists.txt
=====================================
@@ -11,7 +11,10 @@
file(GLOB_RECURSE _sources ${CMAKE_CURRENT_LIST_DIR}/*.c CONFIGURE_DEPEND)
add_library(ryu STATIC ${_sources})
target_include_directories(ryu PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-set_target_properties(ryu PROPERTIES POSITION_INDEPENDENT_CODE ON)
+set_target_properties(ryu PROPERTIES
+ POSITION_INDEPENDENT_CODE ON
+ C_STANDARD 99
+)
unset(_sources)
target_include_directories(geos
=====================================
src/noding/NodingIntersectionFinder.cpp
=====================================
@@ -98,9 +98,10 @@ NodingIntersectionFinder::processIntersections(
}
}
+} // namespace geos.noding
+} // namespace geos
+
#ifndef GEOS_INLINE
-#include "geos/noding/NodingIntersectionFinder.inl"
+# include "geos/noding/NodingIntersectionFinder.inl"
#endif
-} // namespace geos.noding
-} // namespace geos
=====================================
src/operation/overlayng/OverlayLabel.cpp
=====================================
@@ -14,14 +14,14 @@
#include <geos/operation/overlayng/OverlayLabel.h>
+#ifndef GEOS_INLINE
+# include "geos/operation/overlayng/OverlayLabel.inl"
+#endif
+
namespace geos { // geos
namespace operation { // geos.operation
namespace overlayng { // geos.operation.overlayng
-#ifndef GEOS_INLINE
-#include "geos/operation/overlayng/OverlayLabel.inl"
-#endif
-
/*public*/
void
OverlayLabel::initBoundary(uint8_t index, Location locLeft, Location locRight, bool p_isHole)
=====================================
tests/xmltester/tests/robust/overlay/TestOverlay-pg-4738.xml
=====================================
The diff for this file was not included because it is too large.
=====================================
tools/CMakeLists.txt
=====================================
@@ -61,7 +61,7 @@ if(NOT MSVC)
configure_install_geos_pc()
endif()
-option(BUILD_ASTYLE "Build astyle (Artistic Style) tool" ON)
+option(BUILD_ASTYLE "Build astyle (Artistic Style) tool" OFF)
message(STATUS "GEOS: Build astyle ${BUILD_ASTYLE}")
if(BUILD_ASTYLE)
View it on GitLab: https://salsa.debian.org/debian-gis-team/geos/-/commit/fa1f9145b35ba72aa26913be6d304a5ce9f43a97
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/geos/-/commit/fa1f9145b35ba72aa26913be6d304a5ce9f43a97
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20211013/5d844e68/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list