[geos-commits] [SCM] GEOS branch main updated. ddd392528b4962dd8f870f327a133358c0eae69d

git at osgeo.org git at osgeo.org
Tue Oct 19 12:31:19 PDT 2021


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, main has been updated
       via  ddd392528b4962dd8f870f327a133358c0eae69d (commit)
       via  fc56776df12b560703a2ed8ed52167fcfed7d080 (commit)
       via  fe07964e8e095dd31a10d31da0168e9b12b63c3d (commit)
      from  4a7fd4c5c726441ecf47be31f1654a803eac52a2 (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 ddd392528b4962dd8f870f327a133358c0eae69d
Merge: fc56776df 4a7fd4c5c
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Oct 19 12:31:14 2021 -0700

    Merge branch 'main' of https://git.osgeo.org/gitea/geos/geos into main


commit fc56776df12b560703a2ed8ed52167fcfed7d080
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Oct 19 12:30:19 2021 -0700

    Allow std::vector to control its own capacity during in-fill by EdgeRing traversal. Removes large performance issue in buffer against Australia case.

diff --git a/src/geomgraph/EdgeRing.cpp b/src/geomgraph/EdgeRing.cpp
index 6481ed05b..9c122232f 100644
--- a/src/geomgraph/EdgeRing.cpp
+++ b/src/geomgraph/EdgeRing.cpp
@@ -316,7 +316,6 @@ EdgeRing::addPoints(Edge* edge, bool isForward, bool isFirstEdge)
     assert(edgePts);
     std::size_t numEdgePts = edgePts->getSize();
 
-    pts.reserve(pts.size() + numEdgePts);
     if(isForward) {
         if(isFirstEdge) {
             edgePts->toVector(pts);

commit fe07964e8e095dd31a10d31da0168e9b12b63c3d
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Oct 15 13:51:50 2021 -0700

    Set 3.10.0rc2

diff --git a/Version.txt b/Version.txt
index d77e7f272..75ed719c2 100644
--- a/Version.txt
+++ b/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=rc2
 
 # GEOS CAPI Versions
 #

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

Summary of changes:
 Version.txt                | 2 +-
 src/geomgraph/EdgeRing.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list