[geos-commits] [SCM] GEOS branch main updated. 9f80ea6d9293db0090469070caf58ab6f34e936d

[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, main has been updated
       via  9f80ea6d9293db0090469070caf58ab6f34e936d (commit)
      from  75c538dc1841a905f0cc771230ce67e405343fb9 (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 9f80ea6d9293db0090469070caf58ab6f34e936d
Author: Mike Taves <mwtoews at gmail.com>
Date:   Tue Oct 20 09:37:32 2026 +1300

    Revise GH-1555 to remove isnan guards and skip FE_INVALID test for optimized Clang 15 or later on x86_64

diff --git a/include/geos/geom/Envelope.h b/include/geos/geom/Envelope.h
index dbbd1577f..15d360030 100644
--- a/include/geos/geom/Envelope.h
+++ b/include/geos/geom/Envelope.h
@@ -609,11 +609,6 @@ public:
      */
     bool intersects(double x, double y) const
     {
-#if defined(__OPTIMIZE__) && defined(__x86_64__) && defined(__clang__) && (__clang_major__ >= 15)
-        if(std::isnan(x) || std::isnan(maxx)) {
-            return false;
-        }
-#endif  /* defined(__OPTIMIZE__) && defined(__clang__) ... */
         return std::islessequal(x, maxx) &&
                std::isgreaterequal(x, minx) &&
                std::islessequal(y, maxy) &&
@@ -664,11 +659,6 @@ public:
      * @return `true` if `(x, y)` lies in the interior or on the boundary of this Envelope.
      */
     bool covers(double x, double y) const {
-#if defined(__OPTIMIZE__) && defined(__x86_64__) && defined(__clang__) && (__clang_major__ >= 15)
-        if(std::isnan(x) || std::isnan(minx)) {
-            return false;
-        }
-#endif  /* defined(__OPTIMIZE__) && defined(__clang__) ... */
         return std::isgreaterequal(x,  minx) &&
                std::islessequal(x, maxx) &&
                std::isgreaterequal(y, miny) &&
diff --git a/tests/unit/geom/EnvelopeTest.cpp b/tests/unit/geom/EnvelopeTest.cpp
index 55f6c0dfc..a289438bd 100644
--- a/tests/unit/geom/EnvelopeTest.cpp
+++ b/tests/unit/geom/EnvelopeTest.cpp
@@ -265,8 +265,8 @@ void object::test<6>
     check_intersects(small, {-1, -1}, true);
     check_intersects(small, {5, 5}, false);
 
-#if !( defined(__OPTIMIZE__) && defined(__x86_64__) && defined(__clang__) && defined(__apple_build_version__) )
-//  Exclude optimized Apple Clang on x86_64 osx - raises FE_INVALID
+#if !( defined(__OPTIMIZE__) && defined(__x86_64__) && defined(__clang__) && (__clang_major__ >= 15) )
+//  Exclude optimized Clang 15 or later on x86_64 - raises FE_INVALID
     check_intersects(empty, {0, 0}, false);
 #endif
 

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

Summary of changes:
 include/geos/geom/Envelope.h     | 10 ----------
 tests/unit/geom/EnvelopeTest.cpp |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
GEOS