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

Merge branch 'Mesh_3-fix_with_time_stamps-GF' into releases/CGAL-4.5-branch 

Fix a bug in Mesh_3, when timestamps are used to compare Vertex_handle
and Cell_handle. The bug was in the class
Protect_edges_sizing_field. Once a vertex is removed from a
triangulation, the timestamp of the Vertex can change. That means that
it invalidates any future use of the original Vertex_handle.

Bug-fix for CGAL-4.5, approved by the Release Manager.
This commit is contained in:
Laurent Rineau 2014-10-06 12:39:07 +02:00
parent 602c33c897 798db08a11
commit 90f02e7c73
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
View File

@ -33,6 +33,7 @@
#ifndef CGAL_NO_ASSERTIONS #ifndef CGAL_NO_ASSERTIONS
# include <boost/math/special_functions/next.hpp> // for float_prior # include <boost/math/special_functions/next.hpp> // for float_prior
#endif #endif
#include <boost/function_output_iterator.hpp>
namespace CGAL { namespace CGAL {
namespace Mesh_3 { namespace Mesh_3 {
@ -1194,6 +1195,7 @@ change_ball_size(const Vertex_handle& v, const FT size, const bool special_ball)
c3t3_.remove_from_complex(v); c3t3_.remove_from_complex(v);
} }
unchecked_vertices_.erase(v);
// Change v size // Change v size
c3t3_.triangulation().remove(v); c3t3_.triangulation().remove(v);
@ -1235,11 +1237,25 @@ change_ball_size(const Vertex_handle& v, const FT size, const bool special_ball)
} }
// Update unchecked vertices // Update unchecked vertices
unchecked_vertices_.erase(v);
unchecked_vertices_.insert(new_v); unchecked_vertices_.insert(new_v);
return new_v; return new_v;
} }
namespace details {
// Functor used by Protect_edges_sizing_field::check_and_repopulate_edges, below
template <typename Set>
class Erase_element_from_set {
Set* set_ptr;
public:
Erase_element_from_set(Set& set) : set_ptr(&set) {}
void operator()(const typename Set::key_type& x)
{
set_ptr->erase(x);
}
}; // end class Erase_element_from_set
} // end namespace details
template <typename C3T3, typename MD, typename Sf> template <typename C3T3, typename MD, typename Sf>
void void
@ -1249,7 +1265,8 @@ check_and_repopulate_edges()
#ifdef CGAL_MESH_3_PROTECTION_DEBUG #ifdef CGAL_MESH_3_PROTECTION_DEBUG
std::cerr << "check_and_repopulate_edges()\n"; std::cerr << "check_and_repopulate_edges()\n";
#endif #endif
std::set<Vertex_handle> vertices; typedef std::set<Vertex_handle> Vertices;
Vertices vertices;
std::copy( unchecked_vertices_.begin(), unchecked_vertices_.end(), std::copy( unchecked_vertices_.begin(), unchecked_vertices_.end(),
std::inserter(vertices,vertices.begin()) ); std::inserter(vertices,vertices.begin()) );
@ -1260,15 +1277,11 @@ check_and_repopulate_edges()
{ {
Vertex_handle v = *vertices.begin(); Vertex_handle v = *vertices.begin();
vertices.erase(vertices.begin()); vertices.erase(vertices.begin());
Vertex_vector erased_vertices; details::Erase_element_from_set<Vertices> erase_from_vertices(vertices);
check_and_fix_vertex_along_edge(v, std::back_inserter(erased_vertices));
check_and_fix_vertex_along_edge(v,
for ( typename Vertex_vector::iterator vit = erased_vertices.begin(), boost::make_function_output_iterator(erase_from_vertices));
vend = erased_vertices.end() ; vit != vend ; ++vit )
{
vertices.erase(*vit);
}
} }
} }