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

Merge pull request #681 from sloriot/SMSP-fix_warnings 

Surface mesh shortest path: fix warnings
This commit is contained in:
Sebastien Loriot 2016-01-28 13:57:30 +01:00
parent bf0725abad 73f27dd6fb
commit eb57c4f2bf
2 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/function_objects.h
View File

@ -454,51 +454,30 @@ public:
Line_2 s2Line(m_construct_line_2(s2));
LineLineIntersectResult intersectResult1(m_intersect_2(s1Line, l1));
CGAL_assertion(bool(intersectResult1));
if (!intersectResult1) return CGAL::SMALLER;
Point_2 p1;
const Point_2* p1_ptr = boost::get<Point_2, Point_2, Line_2>(&*intersectResult1);
FT t1;
CGAL_assertion(p1_ptr && "Intersection should have been a point");
if (!p1_ptr) return CGAL::SMALLER;
if (intersectResult1)
{
Point_2* result = boost::get<Point_2, Point_2, Line_2>(&*intersectResult1);
CGAL_assertion(result && "Intersection should have been a point");
if (result)
{
t1 = m_parametric_distance_along_segment_2(s1, *result);
p1 = *result;
CGAL_assertion_code(FT t1 = m_parametric_distance_along_segment_2(s1, *p1_ptr);)
CGAL_assertion(t1 >= FT(-0.00001) && t1 <= FT(1.00001));
}
}
LineLineIntersectResult intersectResult2 = m_intersect_2(s2Line, l2);
CGAL_assertion(bool(intersectResult2));
if (!intersectResult2) return CGAL::SMALLER;
FT t2;
Point_2 p2;
const Point_2* p2_ptr = boost::get<Point_2, Point_2, Line_2>(&*intersectResult2);
if (intersectResult2)
{
Point_2* result = boost::get<Point_2, Point_2, Line_2>(&*intersectResult2);
CGAL_assertion(p2_ptr && "Intersection should have been a point");
if (!p2_ptr) return CGAL::SMALLER;
CGAL_assertion(result && "Intersection should have been a point");
if (result)
{
t2 = m_parametric_distance_along_segment_2(s2, *result);
p2 = *result;
CGAL_assertion_code(FT t2 = m_parametric_distance_along_segment_2(s2, *p2_ptr);)
CGAL_assertion(t2 >= FT(-0.00001) && t2 <= FT(1.00001));
}
}
result_type predicateResult = m_compare_distance_2(s1.source(), p1, s2.source(), p2);
return predicateResult;
return m_compare_distance_2(s1.source(), *p1_ptr, s2.source(), *p2_ptr);
}
};

2
Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/TestMesh.cpp
View File

@ -343,7 +343,7 @@ int main(int argc, char** argv)
}
else
{
std::cerr << "Error, must specify a polyhedron." << std::endl;
std::cerr << "No polyhedron specified, nothing will be tested." << std::endl;
}
return 0;