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

Merge pull request #3538 from maxGimeno/BGL-Fix_add_face-GF 

BGL: Fix Euler::add_face()
This commit is contained in:
Laurent Rineau 2018-12-19 16:01:14 +01:00
parent e4461a9057 c51852f8a1
commit 0ec8873a37
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BGL/include/CGAL/boost/graph/Euler_operations.h
View File

@ -585,8 +585,16 @@ add_face(const VertexRange& vr, Graph& g)
std::vector<vertex_descriptor> vertices(vr.begin(), vr.end()); // quick and dirty copy std::vector<vertex_descriptor> vertices(vr.begin(), vr.end()); // quick and dirty copy
unsigned int n = (unsigned int)vertices.size(); unsigned int n = (unsigned int)vertices.size();
//check that every vertex is unique
std::sort(vertices.begin(), vertices.end());
if(std::adjacent_find(vertices.begin(), vertices.end()) != vertices.end()){
return boost::graph_traits<Graph>::null_face();
}
std::copy(vr.begin(), vr.end(), vertices.begin());
// don't allow degenerated faces // don't allow degenerated faces
CGAL_assertion(n > 2); if(n <= 2){
return boost::graph_traits<Graph>::null_face();
}
std::vector<halfedge_descriptor> halfedges(n); std::vector<halfedge_descriptor> halfedges(n);
std::vector<bool> is_new(n); std::vector<bool> is_new(n);

5
Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
View File

@ -2551,6 +2551,11 @@ void
Surface_mesh<P>:: Surface_mesh<P>::
collect_garbage() collect_garbage()
{ {
if (!has_garbage())
{
return;
}
int i, i0, i1, int i, i0, i1,
nV(num_vertices()), nV(num_vertices()),
nE(num_edges()), nE(num_edges()),