X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FcpPlugins%2FPlugins%2FBasicFilters%2FRGBImageToOtherChannelsFilter.cxx;h=92b8ac5e094cecf404a59b8ab8a66c734434aa0f;hb=b6c7e73ebcce23619daced67f85d9e1364b33f30;hp=13e6732abc1bd7410ffd31e00ccbc321b3294613;hpb=91f750d8a54e87cdd626566aad3d80940ae041fd;p=cpPlugins.git

diff --git a/lib/cpPlugins/Plugins/BasicFilters/RGBImageToOtherChannelsFilter.cxx b/lib/cpPlugins/Plugins/BasicFilters/RGBImageToOtherChannelsFilter.cxx
index 13e6732..92b8ac5 100644
--- a/lib/cpPlugins/Plugins/BasicFilters/RGBImageToOtherChannelsFilter.cxx
+++ b/lib/cpPlugins/Plugins/BasicFilters/RGBImageToOtherChannelsFilter.cxx
@@ -11,10 +11,8 @@ cpPlugins::BasicFilters::RGBImageToOtherChannelsFilter::
 RGBImageToOtherChannelsFilter( )
   : Superclass( )
 {
-  typedef cpPlugins::Interface::Parameters TParameters;
-
   this->_AddInput( "Input" );
-  this->_MakeOutput< cpPlugins::Interface::Image >( "Output" );
+  this->_AddOutput< cpPlugins::Interface::Image >( "Output" );
 
   std::vector< std::string > choices;
   choices.push_back( "HSV" );
@@ -32,11 +30,7 @@ cpPlugins::BasicFilters::RGBImageToOtherChannelsFilter::
 std::string cpPlugins::BasicFilters::RGBImageToOtherChannelsFilter::
 _GenerateData( )
 {
-  cpPlugins::Interface::Image* image =
-    this->GetInput< cpPlugins::Interface::Image >( "Input" );
-  if( image == NULL )
-    return( "RGBImageToOtherChannelsFilter: No input image." );
-
+  auto image = this->GetInputData( "Input" );
   itk::DataObject* itk_image = NULL;
   std::string r = "";
   cpPlugins_Image_Demangle_AllRGBTypes( 2, image, itk_image, r, _GD0 );
@@ -86,16 +80,8 @@ _RealGD( itk::DataObject* image )
   filter->Update( );
 
   // Connect output
-  cpPlugins::Interface::Image* out =
-    this->GetOutput< cpPlugins::Interface::Image >( "Output" );
-  if( out != NULL )
-  {
-    out->SetITK< _O >( filter->GetOutput( ) );
-    return( "" );
-  }
-  else
-    return( "RGBImageToOtherChannelsFilter: output not correctly created." );
-
+  auto out = this->GetOutputData( "Output" );
+  out->SetITK( filter->GetOutput( ) );
   return( "" );
 }