[geos-commits] [SCM] GEOS branch 3.9 updated. 7651b45c0ba50f483eab25ccdf79549ab8fea57e

git at osgeo.org git at osgeo.org
Sat Nov 11 23:52:56 PST 2023


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  7651b45c0ba50f483eab25ccdf79549ab8fea57e (commit)
       via  23e07a54ef18e53dada85d3b0dcd41d84969d315 (commit)
       via  47e56eeffaba9d918c75d8dab1f657e3162a72cb (commit)
      from  d5cc75b5881ba13133bd29be823314ef7269d043 (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 7651b45c0ba50f483eab25ccdf79549ab8fea57e
Author: Regina Obe <lr at pcorp.us>
Date:   Sun Nov 12 02:52:38 2023 -0500

    Flip to 3.9.6dev milestone

diff --git a/NEWS b/NEWS
index 28ca9ee46..ac74b3aac 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+## Changes in 3.9.6
+xxxx-xx-xx
+
+- Bug fixes / improvements:
+
+
 ## Changes in 3.9.5
 2023-11-12
 
diff --git a/Version.txt b/Version.txt
index 9b3cbb0a3..b0c752dcc 100644
--- a/Version.txt
+++ b/Version.txt
@@ -2,10 +2,10 @@
 # GEOS Versions
 GEOS_VERSION_MAJOR=3
 GEOS_VERSION_MINOR=9
-GEOS_VERSION_PATCH=5
+GEOS_VERSION_PATCH=6
 
 # OPTIONS: "", "dev", "rc1" etc.
-GEOS_PATCH_WORD=
+GEOS_PATCH_WORD=dev
 
 # GEOS CAPI Versions
 #
@@ -16,7 +16,7 @@ GEOS_PATCH_WORD=
 #   ( THIS MUST BE CAREFULLY AVOIDED )
 #
 CAPI_INTERFACE_CURRENT=15
-CAPI_INTERFACE_REVISION=5
+CAPI_INTERFACE_REVISION=6
 CAPI_INTERFACE_AGE=14
 
 # JTS Port

commit 23e07a54ef18e53dada85d3b0dcd41d84969d315
Author: Regina Obe <lr at pcorp.us>
Date:   Sun Nov 12 02:03:12 2023 -0500

    More missing cstdint headers
    Closes #990, References #743

diff --git a/NEWS b/NEWS
index 6e1cb80f7..28ca9ee46 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-Changes in 3.9.5
-2023-11-xx
+## Changes in 3.9.5
+2023-11-12
 
 - Bug fixes / improvements:
   - GEOSUnaryUnion: Fix crash on collection containing empty point (GH-830, Dan Baston)
@@ -10,9 +10,10 @@ Changes in 3.9.5
   - GEOSClipByRect: Fix case with POINT EMPTY (GH-913, Mike Taves)
   - Remove undefined behaviour in use of null PrecisionModel (GH-931, Jeff Walton)
   - Skip over testing empty distances for mixed collections (GH-979, Paul Ramsey)
+  - Add missing cstdint headers (GH-990, GH-743, Regina Obe, Sergei Trofimovich)
 
 
-Changes in 3.9.4
+## Changes in 3.9.4
 2022-11-14
 
 - Bug fixes / improvements:
diff --git a/include/geos/geomgraph/Depth.h b/include/geos/geomgraph/Depth.h
index 2e12545a3..181e1e00a 100644
--- a/include/geos/geomgraph/Depth.h
+++ b/include/geos/geomgraph/Depth.h
@@ -21,9 +21,11 @@
 #ifndef GEOS_GEOMGRAPH_DEPTH_H
 #define GEOS_GEOMGRAPH_DEPTH_H
 
+#include <cstdint>
+#include <string>
+
 #include <geos/export.h>
 #include <geos/geom/Location.h>
-#include <string>
 
 #include <geos/inline.h>
 
diff --git a/include/geos/io/WKTWriter.h b/include/geos/io/WKTWriter.h
index c0af8e713..0d60e9756 100644
--- a/include/geos/io/WKTWriter.h
+++ b/include/geos/io/WKTWriter.h
@@ -25,6 +25,7 @@
 
 #include <string>
 #include <cctype>
+#include <cstdint>
 
 #ifdef _MSC_VER
 #pragma warning(push)
diff --git a/include/geos/operation/overlayng/OverlayLabel.h b/include/geos/operation/overlayng/OverlayLabel.h
index 6b7db1da5..3f0a83054 100644
--- a/include/geos/operation/overlayng/OverlayLabel.h
+++ b/include/geos/operation/overlayng/OverlayLabel.h
@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include <cstdint>
+
 #include <geos/geom/Location.h>
 #include <geos/geom/Position.h>
 #include <geos/export.h>
diff --git a/include/geos/shape/fractal/HilbertCode.h b/include/geos/shape/fractal/HilbertCode.h
index 46012efcc..beeb28c6d 100644
--- a/include/geos/shape/fractal/HilbertCode.h
+++ b/include/geos/shape/fractal/HilbertCode.h
@@ -17,6 +17,7 @@
 
 #include <geos/export.h>
 #include <string>
+#include <cstdint>
 
 // Forward declarations
 namespace geos {
diff --git a/include/geos/shape/fractal/MortonCode.h b/include/geos/shape/fractal/MortonCode.h
index 6743f87cf..049dc322b 100644
--- a/include/geos/shape/fractal/MortonCode.h
+++ b/include/geos/shape/fractal/MortonCode.h
@@ -17,6 +17,8 @@
 
 #include <geos/export.h>
 #include <string>
+#include <cstdint>
+
 
 // Forward declarations
 namespace geos {

commit 47e56eeffaba9d918c75d8dab1f657e3162a72cb
Author: Regina Obe <lr at pcorp.us>
Date:   Sun Nov 12 01:54:13 2023 -0500

    Add missing headers. Closes #990 for GEOS 3.9.5

diff --git a/include/geos/geomgraph/TopologyLocation.h b/include/geos/geomgraph/TopologyLocation.h
index 4cbbacb34..2873f6f2b 100644
--- a/include/geos/geomgraph/TopologyLocation.h
+++ b/include/geos/geomgraph/TopologyLocation.h
@@ -20,15 +20,16 @@
 
 #ifndef GEOS_GEOMGRAPH_TOPOLOGYLOCATION_H
 #define GEOS_GEOMGRAPH_TOPOLOGYLOCATION_H
+#include <vector>
+#include <array>
+#include <string>
+#include <cassert>
+#include <cstdint>
 
 #include <geos/export.h>
 #include <geos/inline.h>
 #include <geos/geom/Location.h>
 
-#include <vector>
-#include <array>
-#include <string>
-
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class

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

Summary of changes:
 NEWS                                            | 13 ++++++++++---
 Version.txt                                     |  6 +++---
 include/geos/geomgraph/Depth.h                  |  4 +++-
 include/geos/geomgraph/TopologyLocation.h       |  9 +++++----
 include/geos/io/WKTWriter.h                     |  1 +
 include/geos/operation/overlayng/OverlayLabel.h |  2 ++
 include/geos/shape/fractal/HilbertCode.h        |  1 +
 include/geos/shape/fractal/MortonCode.h         |  2 ++
 8 files changed, 27 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list