|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r76863 - trunk/boost/geometry/strategies/cartesian
From: barend.gehrels_at_[hidden]
Date: 2012-02-03 18:33:29
Author: barendgehrels
Date: 2012-02-03 18:33:28 EST (Fri, 03 Feb 2012)
New Revision: 76863
URL: http://svn.boost.org/trac/boost/changeset/76863
Log:
Fixed disjoint case directed to "error" (which as later on directed to disjoint again, why it was never noticed, but that is changed now)
Text files modified:
trunk/boost/geometry/strategies/cartesian/cart_intersect.hpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Modified: trunk/boost/geometry/strategies/cartesian/cart_intersect.hpp
==============================================================================
--- trunk/boost/geometry/strategies/cartesian/cart_intersect.hpp (original)
+++ trunk/boost/geometry/strategies/cartesian/cart_intersect.hpp 2012-02-03 18:33:28 EST (Fri, 03 Feb 2012)
@@ -121,7 +121,7 @@
coordinate_type const& dx_a, coordinate_type const& dy_a,
coordinate_type const& dx_b, coordinate_type const& dy_b)
{
- // 1) Handle "disjoint", probably common case.
+ // 1) Handle "disjoint", common case.
// per dimension, 2 cases: a_1----------a_2 b_1-------b_2 or B left of A
coordinate_type ax_1, ax_2, bx_1, bx_2;
bool ax_swapped = false, bx_swapped = false;
@@ -137,7 +137,7 @@
bool ay_swapped = false, by_swapped = false;
detail::segment_arrange<segment_type1, 1>::apply(a, ay_1, ay_2, ay_swapped);
detail::segment_arrange<segment_type2, 1>::apply(b, by_1, by_2, by_swapped);
- if (ay_2 < ay_1 || ay_1 > by_2)
+ if (ay_2 < by_1 || ay_1 > by_2)
{
return Policy::disjoint();
}
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk