[geos-commits] [SCM] GEOS branch 3.10 updated. c1f3686c25e8e80b1d0656de1a68c837da2fa8de

[git at osgeo.org]

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  c1f3686c25e8e80b1d0656de1a68c837da2fa8de (commit)
       via  8aed9d4034f50a7b0fb5fb3e372c242890ad6e67 (commit)
      from  8809f7c9ab68594e843151008899bd7d9b10223f (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 c1f3686c25e8e80b1d0656de1a68c837da2fa8de
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Sun Oct 31 17:28:59 2021 -0700

    separate test step in mingw

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 12cf28803..5cae61c19 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -163,6 +163,10 @@ jobs:
        cmake --version
        cmake -DCMAKE_BUILD_TYPE=Debug -G"MSYS Makefiles" ..
        cmake --build . -j 2
+
+    - name: 'Test'
+      run: |
+       cd build
        ctest --output-on-failure .
 
   windows-mingw-release:
@@ -188,6 +192,10 @@ jobs:
        cmake --version
        cmake -DCMAKE_BUILD_TYPE=Release -G"MSYS Makefiles" ..
        cmake --build . -j 2
+
+    - name: 'Test'
+      run: |
+       cd build
        ctest --output-on-failure .
 
   windows-msvc-22:

commit 8aed9d4034f50a7b0fb5fb3e372c242890ad6e67
Author: eyal0 <109809+eyal0 at users.noreply.github.com>
Date:   Thu Oct 28 21:06:38 2021 -0600

    Invert conditional in unionSafe()
    
    This prevents the compiler from mistakenly thinking that the
    dereferenced geometry is .  The compiler *should* have been able to
    figure this out and suppress the warning but it doesn't.
    
    This change shouldn't affect the functionality of the code.  It only
    gives a better hint to the compiler about the validity of the pointer
    to Geometry.

diff --git a/src/operation/union/CascadedPolygonUnion.cpp b/src/operation/union/CascadedPolygonUnion.cpp
index c30c6f7eb..1db99e630 100644
--- a/src/operation/union/CascadedPolygonUnion.cpp
+++ b/src/operation/union/CascadedPolygonUnion.cpp
@@ -120,18 +120,17 @@ CascadedPolygonUnion::binaryUnion(const std::vector<const geom::Geometry*> & geo
 std::unique_ptr<geom::Geometry>
 CascadedPolygonUnion::unionSafe(const geom::Geometry* g0, const geom::Geometry* g1) const
 {
-    if(g0 == nullptr && g1 == nullptr) {
-        return nullptr;
+    if(g0 != nullptr && g1 != nullptr) {
+        return unionActual(g0, g1);
     }
 
-    if(g0 == nullptr) {
+    if(g1 != nullptr) {
         return g1->clone();
     }
-    if(g1 == nullptr) {
+    if(g0 != nullptr) {
         return g0->clone();
     }
-
-    return unionActual(g0, g1);
+    return nullptr;
 }
 
 std::unique_ptr<geom::Geometry>

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

Summary of changes:
 .github/workflows/ci.yml                     |  8 ++++++++
 src/operation/union/CascadedPolygonUnion.cpp | 11 +++++------
 2 files changed, 13 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GEOS