songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Other fixes for GMPXX 

Followup-up to the previous commit.
This commit is contained in:
Laurent Rineau 2019-02-05 12:55:28 +01:00
parent bc4da1f4e6
commit 300659577a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Approx_offset_base_2.h
View File

@ -252,8 +252,8 @@ protected:
}
else
{
abs_delta_x = (sign_delta_x == POSITIVE) ? delta_x : -delta_x;
abs_delta_y = (sign_delta_y == POSITIVE) ? delta_y : -delta_y;
abs_delta_x = (sign_delta_x == POSITIVE) ? delta_x : NT(-delta_x);
abs_delta_y = (sign_delta_y == POSITIVE) ? delta_y : NT(-delta_y);
// In this general case, the length d of the current edge is usually
// an irrational number.

6
Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Basic_predicates_C2.h
View File

@ -391,7 +391,7 @@ public: // compute_supporting_line(q.supporting_segment(), a1, b1, c1);
Comparison_result cmpxqp = cmpx(q,p);
CGAL_assertion(cmpxqp != EQUAL);
b = (cmpxqp == SMALLER) ? RT(-1) : RT(1);
c = (cmpxqp == SMALLER) ? p.y() : -p.y();
c = (cmpxqp == SMALLER) ? p.y() : RT(-p.y());
return Line_2(RT(0), b, c);
}
@ -405,7 +405,7 @@ public: // compute_supporting_line(q.supporting_segment(), a1, b1, c1);
CGAL_assertion(cmpypq != EQUAL);
a = (cmpypq == SMALLER) ? RT(-1) : RT(1);
//a = RT(CGAL::sign(p.y() - q.y()));
c = (cmpypq == SMALLER) ? p.x() : -p.x();
c = (cmpypq == SMALLER) ? p.x() : RT(-p.x());
return Line_2(a, RT(0), c);
}
@ -457,7 +457,7 @@ public: // compute_supporting_line(q.supporting_segment(), a1, b1, c1);
const RT nomin = CGAL::abs(l.a() * p.x() + l.b() * p.y() + l.c());
const RT denom = CGAL::abs(
l.a() +
( CGAL::sign(l.a()) == CGAL::sign(l.b())? l.b() : -l.b() ) );
( CGAL::sign(l.a()) == CGAL::sign(l.b())? l.b() : RT(-l.b()) ) );
return std::pair<RT,RT>(nomin, denom);
}