[geos-commits] [SCM] GEOS branch svn-3.6 updated. e72e44c3890f0f08afd4430b746fe7db4072a0de

git at osgeo.org git at osgeo.org
Wed Aug 1 06:41:19 PDT 2018


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, svn-3.6 has been updated
       via  e72e44c3890f0f08afd4430b746fe7db4072a0de (commit)
      from  b0f3f66c73ee2607daedbe386363a3efc80c0186 (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 e72e44c3890f0f08afd4430b746fe7db4072a0de
Author: Daniel Baston <dbaston at gmail.com>
Date:   Wed Aug 1 08:43:48 2018 -0400

    Avoid use of C++11 scoped enum

diff --git a/src/operation/intersection/RectangleIntersectionBuilder.cpp b/src/operation/intersection/RectangleIntersectionBuilder.cpp
index d9d269f..0b17642 100644
--- a/src/operation/intersection/RectangleIntersectionBuilder.cpp
+++ b/src/operation/intersection/RectangleIntersectionBuilder.cpp
@@ -185,10 +185,10 @@ double distance(const Rectangle & rect,
   Rectangle::Position pos = rect.position(x1,y1);
   Rectangle::Position endpos = rect.position(x2,y2);
 
-  if (pos & Rectangle::Position::Outside ||
-      endpos & Rectangle::Position::Outside ||
-	  pos & Rectangle::Position::Inside ||
-	  endpos & Rectangle::Position::Inside) {
+  if (pos & Rectangle::Outside ||
+      endpos & Rectangle::Outside ||
+	  pos & Rectangle::Inside ||
+	  endpos & Rectangle::Inside) {
   	throw geos::util::IllegalArgumentException("Can't compute distance to non-boundary position.");
   }
 

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

Summary of changes:
 src/operation/intersection/RectangleIntersectionBuilder.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list