Fixed disjoint case directed to "error" (which as later on directed to disjoint again, why it was never noticed, but that is changed now)

[SVN r76863]
This commit is contained in:
Barend Gehrels
2012-02-03 23:33:28 +00:00
parent 89de77ff7e
commit 26100514b9

View File

@@ -121,7 +121,7 @@ struct relate_cartesian_segments
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 @@ struct relate_cartesian_segments
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();
}