[geos-commits] [SCM] GEOS branch master updated. f453c48a6d6cb0ab023caa74a8260802d16c98ef

[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, master has been updated
       via  f453c48a6d6cb0ab023caa74a8260802d16c98ef (commit)
       via  f19e40cee70ee0035b83d9ea97d09b5a5c44ddd9 (commit)
      from  030ee891c8bf571f37174b51084e76c01d738950 (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 f453c48a6d6cb0ab023caa74a8260802d16c98ef
Author: Daniel Baston <dbaston at gmail.com>
Date:   Mon Sep 23 19:28:31 2019 -0400

    Catch exception by reference

diff --git a/src/operation/union/OverlapUnion.cpp b/src/operation/union/OverlapUnion.cpp
index 3dedc16..b371836 100644
--- a/src/operation/union/OverlapUnion.cpp
+++ b/src/operation/union/OverlapUnion.cpp
@@ -111,7 +111,7 @@ OverlapUnion::unionFull(const Geometry* geom0, const Geometry* geom1)
     try {
         return geom0->Union(geom1);
     }
-    catch (geos::util::TopologyException ex) {
+    catch (geos::util::TopologyException & ex) {
         /**
          * If the overlay union fails,
          * try a buffer union, which often succeeds

commit f19e40cee70ee0035b83d9ea97d09b5a5c44ddd9
Author: Daniel Baston <dbaston at gmail.com>
Date:   Mon Sep 23 19:27:46 2019 -0400

    Fix build for -DDISABLE_GEOS_INLINE=YES

diff --git a/src/geomgraph/Depth.cpp b/src/geomgraph/Depth.cpp
index a7fb7c8..95acadc 100644
--- a/src/geomgraph/Depth.cpp
+++ b/src/geomgraph/Depth.cpp
@@ -25,6 +25,10 @@
 #include <geos/geomgraph/Position.h>
 #include <geos/geom/Location.h>
 
+#ifndef GEOS_INLINE
+# include <geos/geomgraph/Depth.inl>
+#endif
+
 using namespace geos::geom;
 
 namespace geos {
diff --git a/src/geomgraph/Label.cpp b/src/geomgraph/Label.cpp
index 7f0bfab..97b955c 100644
--- a/src/geomgraph/Label.cpp
+++ b/src/geomgraph/Label.cpp
@@ -23,6 +23,10 @@
 #include <sstream>
 #include <iostream>
 
+#ifndef GEOS_INLINE
+# include <geos/geomgraph/Label.inl>
+#endif
+
 
 using namespace geos::geom;
 
diff --git a/src/geomgraph/Quadrant.cpp b/src/geomgraph/Quadrant.cpp
index e45bfd0..484e1f4 100644
--- a/src/geomgraph/Quadrant.cpp
+++ b/src/geomgraph/Quadrant.cpp
@@ -18,6 +18,10 @@
 
 #include <geos/geomgraph/Quadrant.h>
 
+#ifndef GEOS_INLINE
+# include <geos/geomgraph/Quadrant.inl>
+#endif
+
 using namespace geos::geom;
 
 namespace geos {
diff --git a/src/geomgraph/TopologyLocation.cpp b/src/geomgraph/TopologyLocation.cpp
index ab744ee..ae9570e 100644
--- a/src/geomgraph/TopologyLocation.cpp
+++ b/src/geomgraph/TopologyLocation.cpp
@@ -26,6 +26,10 @@
 #include <iostream>
 #include <cassert>
 
+#ifndef GEOS_INLINE
+# include <geos/geomgraph/TopologyLocation.inl>
+#endif
+
 using namespace geos::geom;
 
 namespace geos {
diff --git a/src/geomgraph/index/SegmentIntersector.cpp b/src/geomgraph/index/SegmentIntersector.cpp
index 7cc61f1..b3c90e9 100644
--- a/src/geomgraph/index/SegmentIntersector.cpp
+++ b/src/geomgraph/index/SegmentIntersector.cpp
@@ -24,6 +24,11 @@
 #include <geos/geom/Coordinate.h>
 #include <geos/geom/CoordinateSequence.h>
 
+#ifndef GEOS_INLINE
+# include <geos/geomgraph/index/SegmentIntersector.inl>
+#endif
+
+
 #ifndef GEOS_DEBUG
 #define GEOS_DEBUG 0
 #endif
diff --git a/src/inlines.cpp b/src/inlines.cpp
index 8f9d462..273eb83 100644
--- a/src/inlines.cpp
+++ b/src/inlines.cpp
@@ -26,7 +26,7 @@
 // otherwise linker will complain "multiple definition" errors.
 // If using MingW with GEOS_INLINE to build a DLL then MingW's gcc
 // has already generated the stubs for the contents of this file.
-// Hence we need to supress it to avoid "multiple definition" errors
+// Hence we need to suppress it to avoid "multiple definition" errors
 // during the final link phase
 #if !defined(_MSC_VER) && (!defined(__MINGW32__) || defined(__MINGW32__) && !defined(GEOS_DLL_EXPORT) && !defined(DLL_EXPORT) )
 
diff --git a/src/noding/BasicSegmentString.cpp b/src/noding/BasicSegmentString.cpp
index ad826b2..870f1ac 100644
--- a/src/noding/BasicSegmentString.cpp
+++ b/src/noding/BasicSegmentString.cpp
@@ -19,6 +19,10 @@
 #include <geos/noding/BasicSegmentString.h>
 #include <geos/geom/CoordinateSequence.h>
 
+#ifndef GEOS_INLINE
+# include <geos/noding/BasicSegmentString.inl>
+#endif
+
 #ifndef GEOS_DEBUG
 #define GEOS_DEBUG 0
 #endif

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

Summary of changes:
 src/geomgraph/Depth.cpp                    | 4 ++++
 src/geomgraph/Label.cpp                    | 4 ++++
 src/geomgraph/Quadrant.cpp                 | 4 ++++
 src/geomgraph/TopologyLocation.cpp         | 4 ++++
 src/geomgraph/index/SegmentIntersector.cpp | 5 +++++
 src/inlines.cpp                            | 2 +-
 src/noding/BasicSegmentString.cpp          | 4 ++++
 src/operation/union/OverlapUnion.cpp       | 2 +-
 8 files changed, 27 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GEOS