Commit f5cb5c3f authored by David E. DeMarle's avatar David E. DeMarle Committed by Kitware Robot

Merge topic 'FixHTGSqueezeRenameFrozen'

cc01b830 Fix HTG Squeeze function and rename HT internal function Frozen to Freeze
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !5001
parents ef08edf1 cc01b830
......@@ -131,7 +131,7 @@ public:
static vtkCompactHyperTree* New();
//---------------------------------------------------------------------------
vtkHyperTree* Frozen( ) override
vtkHyperTree* Freeze( ) override
{
return this;
}
......
......@@ -183,7 +183,7 @@ public:
/**
* JB Return a frozen instance (a priori compact but potentially not changeable).
*/
virtual vtkHyperTree* Frozen() = 0;
virtual vtkHyperTree* Freeze() = 0;
//@{
/**
......
......@@ -178,10 +178,9 @@ void vtkHyperTreeGrid::Squeeze()
vtkHyperTreeGridIterator itIn;
InitializeTreeIterator( itIn );
vtkIdType indexIn;
vtkHyperTree *ht = vtkHyperTree::SafeDownCast( itIn.GetNextTree( indexIn ) );
while ( ht )
while ( vtkHyperTree *ht = itIn.GetNextTree( indexIn ) )
{
vtkHyperTree *htfrozen = ht->Frozen();
vtkHyperTree *htfrozen = ht->Freeze();
if ( htfrozen != ht )
{
this->SetTree( indexIn, htfrozen );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment