X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FPlugins%2FIO%2FImageReader.cxx;h=fec094476ad212fc25a3b08bf0c4eca793dc745c;hb=a1bcde78beafb5de52201154b3ffb999e64492ca;hp=4b1d365f59e9c96729b7eb826c5631914e42e633;hpb=b4cc15873d07ef87910a4aa6492e74022cda1a25;p=cpPlugins.git diff --git a/lib/cpPlugins/Plugins/IO/ImageReader.cxx b/lib/cpPlugins/Plugins/IO/ImageReader.cxx index 4b1d365..fec0944 100644 --- a/lib/cpPlugins/Plugins/IO/ImageReader.cxx +++ b/lib/cpPlugins/Plugins/IO/ImageReader.cxx @@ -368,25 +368,17 @@ _RealGD( const TStringList& names ) { // Read single image typedef itk::ImageFileReader< I > _SR; - _SR* reader = - dynamic_cast< _SR* >( this->m_RealProcessObject.GetPointer( ) ); - if( reader == NULL ) - { - this->m_RealProcessObject = _SR::New( ); - reader = - dynamic_cast< _SR* >( this->m_RealProcessObject.GetPointer( ) ); - - } // fi + _SR* reader = this->_CreateITK< _SR >( ); reader->SetFileName( names[ 0 ] ); try { reader->Update( ); - out->SetITKImage< I >( reader->GetOutput( ) ); + out->SetITK< I >( reader->GetOutput( ) ); } catch( itk::ExceptionObject& err ) { r = "ImageReader: " + std::string( err.GetDescription( ) ); - out->SetITKImage< I >( NULL ); + out->SetITK< I >( NULL ); } // yrt } @@ -398,29 +390,19 @@ _RealGD( const TStringList& names ) ordered_names.insert( names[ i ] ); typedef itk::ImageSeriesReader< I > _MR; - _MR* reader = - dynamic_cast< _MR* >( this->m_RealProcessObject.GetPointer( ) ); - if( reader == NULL ) - { - this->m_RealProcessObject = _MR::New( ); - reader = - dynamic_cast< _MR* >( this->m_RealProcessObject.GetPointer( ) ); - - } // fi + _MR* reader = this->_CreateITK< _MR >( ); std::set< std::string >::const_iterator fnIt = ordered_names.begin( ); for( ; fnIt != ordered_names.end( ); ++fnIt ) - { reader->AddFileName( *fnIt ); - } try { reader->Update( ); - out->SetITKImage< I >( reader->GetOutput( ) ); + out->SetITK< I >( reader->GetOutput( ) ); } catch( itk::ExceptionObject& err ) { r = "ImageReader: " + std::string( err.GetDescription( ) ); - out->SetITKImage< I >( NULL ); + out->SetITK< I >( NULL ); } // yrt }