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

Fix compilation with gmpxx

This commit is contained in:
Mael Rouxel-Labbé 2021-04-06 16:12:53 +02:00
parent 6d3eacd2cd
commit 306fbaacb3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Distance_3/include/CGAL/squared_distance_Segment_3_Segment_3.h
View File

@ -80,7 +80,7 @@ squared_distance(const typename K::Segment_3& s1,
CGAL_assertion(d != 0); CGAL_assertion(d != 0);
res.x = 0; res.x = 0;
res.y = boost::algorithm::clamp(f/d, 0, 1); // (f - x*c) / d res.y = boost::algorithm::clamp<FT>(f/d, 0, 1); // (f - x*c) / d
res.squared_distance = CGAL::squared_distance(p1, p2 + res.y*v2); res.squared_distance = CGAL::squared_distance(p1, p2 + res.y*v2);
return res; return res;
@ -90,7 +90,7 @@ squared_distance(const typename K::Segment_3& s1,
CGAL_assertion(a != 0); CGAL_assertion(a != 0);
res.y = 0; res.y = 0;
res.x = boost::algorithm::clamp(e/a, 0, 1); // (e + y*c) / a res.x = boost::algorithm::clamp<FT>(e/a, 0, 1); // (e + y*c) / a
res.squared_distance = CGAL::squared_distance(p1 + res.x*v1, p2); res.squared_distance = CGAL::squared_distance(p1 + res.x*v1, p2);
return res; return res;
@ -102,14 +102,14 @@ squared_distance(const typename K::Segment_3& s1,
if(det == 0) if(det == 0)
res.x = 0; res.x = 0;
else else
res.x = boost::algorithm::clamp((e*d - b*f) / det, 0, 1); res.x = boost::algorithm::clamp<FT>((e*d - b*f) / det, 0, 1);
FT xc = res.x*c; FT xc = res.x*c;
// res.y = (f - xc) / d, by definition, but building it up more efficiently // res.y = (f - xc) / d, by definition, but building it up more efficiently
if(f > xc) // y < 0 <=> f - xc / d < 0 <=> f - xc > 0 (since d is -||v2||) if(f > xc) // y < 0 <=> f - xc / d < 0 <=> f - xc > 0 (since d is -||v2||)
{ {
res.y = 0; res.y = 0;
res.x = boost::algorithm::clamp(e/a, 0, 1); // (e + y*c) / a res.x = boost::algorithm::clamp<FT>(e/a, 0, 1); // (e + y*c) / a
} }
else // y >= 0 else // y >= 0
{ {
@ -117,7 +117,7 @@ squared_distance(const typename K::Segment_3& s1,
if(n < d) // y > 1 <=> n / d > 1 <=> n < d (once again, important to note that d is negative!) if(n < d) // y > 1 <=> n / d > 1 <=> n < d (once again, important to note that d is negative!)
{ {
res.y = 1; res.y = 1;
res.x = boost::algorithm::clamp((e + c) / a, 0, 1); // (e + y*c) / a res.x = boost::algorithm::clamp<FT>((e + c) / a, 0, 1); // (e + y*c) / a
} }
else // 0 <= y <= 1 else // 0 <= y <= 1
{ {