[geos-commits] [SCM] GEOS branch master updated. 7f2d9695ad8fe58364adf37c35125421c5c6e4b9

[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  7f2d9695ad8fe58364adf37c35125421c5c6e4b9 (commit)
      from  91bfcd0c29d0f2a61e9eea6faadbcb1817f5127f (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 7f2d9695ad8fe58364adf37c35125421c5c6e4b9
Author: Yury Kartynnik <kartynnik at aimatter.com>
Date:   Tue Jan 7 15:12:12 2020 -0800

    Minor debug code fixes
    
    - Fixes a compile-time error when `GEOS_DEBUG` is defined.
    - Fixes redefining `DEBUG_INTERSECT` with 0 regardless of its value.

diff --git a/src/algorithm/LineIntersector.cpp b/src/algorithm/LineIntersector.cpp
index 1ee32ef..10878b7 100644
--- a/src/algorithm/LineIntersector.cpp
+++ b/src/algorithm/LineIntersector.cpp
@@ -866,7 +866,7 @@ LineIntersector::intersection(const Coordinate& p1, const Coordinate& p2,
         intPtOut = nearestEndpoint(p1, p2, q1, q2);
 #if GEOS_DEBUG
         cerr << "Intersection outside segment envelopes, snapped to "
-             << intPt.toString() << endl;
+             << intPtOut.toString() << endl;
 #endif
     }
 
diff --git a/src/geomgraph/index/SegmentIntersector.cpp b/src/geomgraph/index/SegmentIntersector.cpp
index b3c90e9..b369046 100644
--- a/src/geomgraph/index/SegmentIntersector.cpp
+++ b/src/geomgraph/index/SegmentIntersector.cpp
@@ -33,7 +33,9 @@
 #define GEOS_DEBUG 0
 #endif
 
+#ifndef DEBUG_INTERSECT
 #define DEBUG_INTERSECT 0
+#endif
 
 #if GEOS_DEBUG || DEBUG_INTERSECT
 #include <iostream>

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

Summary of changes:
 src/algorithm/LineIntersector.cpp          | 2 +-
 src/geomgraph/index/SegmentIntersector.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GEOS