manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Corrected ClearHeap Bug (thanks to pirosu)

This commit is contained in:
Paolo Cignoni 2007-01-26 21:27:05 +00:00
parent aacbec3178
commit 2797b41cd5
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vcg/complex/local_optimization.h
View File

@ -22,6 +22,9 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.20 2007/01/19 09:13:09 cignoni
Added Finalize() method to the interface
Revision 1.19 2007/01/11 11:48:33 ganovelli Revision 1.19 2007/01/11 11:48:33 ganovelli
currMetric inizialied to heap.front() (it was heap.back()- wrong) currMetric inizialied to heap.front() (it was heap.back()- wrong)
@ -296,8 +299,9 @@ public:
return !(h.empty()); return !(h.empty());
} }
// Toglie dallo heap tutti i collassi non up to date // It removes from the heap all the operations that are no more 'uptodate'
// Chiamata dalla do decimate ogni tanto quando lo heap diventa troppo grande (>fn*3) // (e.g. collapses that have some recently modified vertices)
// This function is called from time to time by the doOptimization (e.g. when the heap is larger than fn*3)
void ClearHeap() void ClearHeap()
{ {
typename HeapType::iterator hi; typename HeapType::iterator hi;
@ -308,7 +312,13 @@ void ClearHeap()
{ {
delete (*hi).locModPtr; delete (*hi).locModPtr;
*hi=h.back(); *hi=h.back();
h.pop_back(); if(&*hi==&h.back())
{
hi=h.end();
h.pop_back();
break;
}
h.pop_back();
continue; continue;
} }
++hi; ++hi;