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

FIX: crash in Surface_mesh_shortest_path::nearest_to_location 

This crash occurs if the point passed to the
Surface_mesh_shortest_path::nearest_to_location function
is located on a border edge.
It now returns directly the main face if the point is
located on a border edge and do not look anymore for a
non-existent opposite face.
This commit is contained in:
ocarre 2017-07-20 12:21:26 +02:00
parent 7873f24473
commit 1cb9de1579
1 changed files with 24 additions and 19 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/Surface_mesh_shortest_path.h
View File

@ -1738,29 +1738,34 @@ private:
he = next(he, m_graph);
}
halfedge_descriptor oppositeHalfedge = opposite(he, m_graph);
std::size_t oppositeIndex = internal::edge_index(oppositeHalfedge, m_graph);
FT oppositeLocationCoords[3] = { FT(0.0), FT(0.0), FT(0.0) };
oppositeLocationCoords[oppositeIndex] = cbcw(location, (associatedEdge + 1) % 3);
oppositeLocationCoords[(oppositeIndex + 1) % 3] = cbcw(location, associatedEdge);
std::pair<Node_distance_pair,Barycentric_coordinates> mainFace = nearest_on_face(f, location);
Barycentric_coordinates oppositeLocation(cbc(oppositeLocationCoords[0], oppositeLocationCoords[1], oppositeLocationCoords[2]));
std::pair<Node_distance_pair,Barycentric_coordinates> otherFace = nearest_on_face(face(oppositeHalfedge, m_graph), oppositeLocation);
if (mainFace.first.first == NULL)
halfedge_descriptor oppositeHalfedge = opposite(he, m_graph);
if(!oppositeHalfedge->is_border())
{
return otherFace;
}
else if (otherFace.first.first == NULL)
{
return mainFace;
}
else
{
return mainFace.first.second < otherFace.first.second ? mainFace : otherFace;
std::size_t oppositeIndex = internal::edge_index(oppositeHalfedge, m_graph);
FT oppositeLocationCoords[3] = { FT(0.0), FT(0.0), FT(0.0) };
oppositeLocationCoords[oppositeIndex] = cbcw(location, (associatedEdge + 1) % 3);
oppositeLocationCoords[(oppositeIndex + 1) % 3] = cbcw(location, associatedEdge);
Barycentric_coordinates oppositeLocation(cbc(oppositeLocationCoords[0], oppositeLocationCoords[1], oppositeLocationCoords[2]));
std::pair<Node_distance_pair,Barycentric_coordinates> otherFace = nearest_on_face(face(oppositeHalfedge, m_graph), oppositeLocation);
if (mainFace.first.first == NULL)
{
return otherFace;
}
else if (otherFace.first.first == NULL)
{
return mainFace;
}
else
{
return mainFace.first.second < otherFace.first.second ? mainFace : otherFace;
}
}
return mainFace;
}
break;
case CGAL::Surface_mesh_shortest_paths_3::BARYCENTRIC_COORDINATES_ON_VERTEX: