Skip to content
Snippets Groups Projects
Commit 775e9daf authored by Cyrille Valladeau's avatar Cyrille Valladeau
Browse files

ENH : change local variable

parent 654438f6
No related branches found
No related tags found
No related merge requests found
......@@ -55,8 +55,7 @@ WaveletTransform< TInputImage, TOutputImage, TFilter, FORWARD >
GetFilterList()->Resize( GetNumberOfDecompositions() );
this->GetFilterList()->SetNthElement( 0, FilterType::New() );
FilterPointerType filter = this->GetFilterList()->GetNthElement(0); //GetNthFilter( 0 );
FilterPointerType filter = FilterType::New();
filter->SetInput( this->GetInput() );
filter->SetSubsampleImageFactor( GetSubsampleImageFactor() );
......@@ -74,6 +73,8 @@ WaveletTransform< TInputImage, TOutputImage, TFilter, FORWARD >
1.f/static_cast<float>( GetNumberOfDecompositions() ) );
filter->Update();
this->GetFilterList()->SetNthElement( 0, filter );
for ( unsigned int idx = 1; idx < filter->GetNumberOfOutputs(); idx++ )
{
this->GetOutput()->SetNthElement(
......@@ -83,22 +84,21 @@ WaveletTransform< TInputImage, TOutputImage, TFilter, FORWARD >
for ( unsigned int nbDecomp = 1; nbDecomp < GetNumberOfDecompositions(); nbDecomp++ )
{
this->GetFilterList()->SetNthElement( nbDecomp, FilterType::New() );
filter = this->GetFilterList()->GetNthElement(nbDecomp); //this->GetNthFilter( nbDecomp );
filter->SetInput( this->GetNthFilter( nbDecomp-1 )->GetOutput( 0 ) );
filter->SetSubsampleImageFactor( GetSubsampleImageFactor() );
FilterPointerType filterBis = FilterType::New();
filterBis->SetInput( this->GetNthFilter( nbDecomp-1 )->GetOutput( 0 ) );
filterBis->SetSubsampleImageFactor( GetSubsampleImageFactor() );
if ( GetSubsampleImageFactor() == 1 )
filter->SetUpSampleFilterFactor( nbDecomp+1 );
filterBis->SetUpSampleFilterFactor( nbDecomp-1 );
progress->RegisterInternalFilter( filter,
progress->RegisterInternalFilter( filterBis,
1.f/static_cast<float>( GetNumberOfDecompositions() ) );
filter->Update();
for ( unsigned int idx = 1; idx < filter->GetNumberOfOutputs(); idx++ )
filterBis->Update();
this->GetFilterList()->SetNthElement( nbDecomp, filterBis );
for ( unsigned int idx = 1; idx < filterBis->GetNumberOfOutputs(); idx++ )
{
this->GetOutput()->SetNthElement(
this->GetOutput()->Size() - 1 - (nbDecomp+1) * (filter->GetNumberOfOutputs()-1) + idx,
filter->GetOutput( idx ) );
this->GetOutput()->Size() - 1 - (nbDecomp+1) * (filterBis->GetNumberOfOutputs()-1) + idx,
filterBis->GetOutput( idx ) );
}
}
......@@ -232,3 +232,5 @@ WaveletTransform< TInputImage, TOutputImage, TFilter, INVERSE >
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment