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

Bug fix in CMap operation

This commit is contained in:
Guillaume Damiand 2017-11-13 12:02:20 +01:00
parent 64023d2b33
commit 990c05090c
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Combinatorial_map/include/CGAL/Combinatorial_map_operations.h
View File

@ -712,18 +712,18 @@ namespace CGAL
typename CMap::Dart_handle d1, d2; typename CMap::Dart_handle d1, d2;
typename CMap::Dart_handle dg1=amap.null_handle, dg2=amap.null_handle; typename CMap::Dart_handle dg1=amap.null_handle, dg2=amap.null_handle;
typename CMap::size_type mark = amap.get_new_mark(); typename CMap::size_type amark = amap.get_new_mark();
// First we store and mark all the darts of the 1-cell to contract. // First we store and mark all the darts of the 1-cell to contract.
std::deque<typename CMap::Dart_handle> to_erase; std::deque<typename CMap::Dart_handle> to_erase;
for ( CGAL::CMap_dart_iterator_basic_of_cell<CMap,1> it(amap,adart,mark); for ( CGAL::CMap_dart_iterator_basic_of_cell<CMap,1> it(amap,adart,amark);
it.cont(); ++it ) it.cont(); ++it )
{ {
to_erase.push_back(it); to_erase.push_back(it);
if ( dg1==amap.null_handle && !amap.template is_free<0>(it) && if ( dg1==amap.null_handle && !amap.template is_free<0>(it) &&
!amap.template is_free<1>(it) ) !amap.template is_free<1>(it) )
{ dg1=amap.template beta<0>(it); dg2=amap.template beta<1>(it); } { dg1=amap.template beta<0>(it); dg2=amap.template beta<1>(it); }
amap.mark(it, mark); amap.mark(it, amark);
++res; ++res;
} }
@ -756,7 +756,8 @@ namespace CGAL
if ( (*it)->beta(0)!=(*it)->beta(1) )*/ if ( (*it)->beta(0)!=(*it)->beta(1) )*/
if ( amap.are_attributes_automatically_managed() && update_attributes ) if ( amap.are_attributes_automatically_managed() && update_attributes )
{ {
modified_darts.push_back(amap.template beta<1>(*it)); if (!amap.is_marked(amap.template beta<1>(*it), amark))
{ modified_darts.push_back(amap.template beta<1>(*it)); }
} }
amap.basic_link_beta_1(amap.template beta<0>(*it), amap.basic_link_beta_1(amap.template beta<0>(*it),
amap.template beta<1>(*it)); amap.template beta<1>(*it));
@ -766,7 +767,8 @@ namespace CGAL
{ {
if ( amap.are_attributes_automatically_managed() && update_attributes ) if ( amap.are_attributes_automatically_managed() && update_attributes )
{ {
modified_darts2.push_back(amap.template beta<0>(*it)); if (!amap.is_marked(amap.template beta<0>(*it), amark))
{ modified_darts2.push_back(amap.template beta<0>(*it)); }
} }
amap.template dart_unlink_beta<1>(amap.template beta<0>(*it)); amap.template dart_unlink_beta<1>(amap.template beta<0>(*it));
} }
@ -777,7 +779,8 @@ namespace CGAL
{ {
if ( amap.are_attributes_automatically_managed() && update_attributes ) if ( amap.are_attributes_automatically_managed() && update_attributes )
{ {
modified_darts.push_back(amap.template beta<1>(*it)); if (!amap.is_marked(amap.template beta<1>(*it), amark))
{ modified_darts.push_back(amap.template beta<1>(*it)); }
} }
amap.template dart_unlink_beta<0>(amap.template beta<1>(*it)); amap.template dart_unlink_beta<0>(amap.template beta<1>(*it));
} }
@ -788,8 +791,8 @@ namespace CGAL
for ( it=to_erase.begin(); it!=to_erase.end(); ++it ) for ( it=to_erase.begin(); it!=to_erase.end(); ++it )
{ amap.erase_dart(*it); } { amap.erase_dart(*it); }
CGAL_assertion( amap.is_whole_map_unmarked(mark) ); CGAL_assertion( amap.is_whole_map_unmarked(amark) );
amap.free_mark(mark); amap.free_mark(amark);
if ( amap.are_attributes_automatically_managed() && update_attributes ) if ( amap.are_attributes_automatically_managed() && update_attributes )
{ {