X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=plugins%2FcpPluginsImageFilters%2FOrImageFilter.cxx;h=f45774cce4f99fb2d66280d9ff3ecd9c6e901179;hb=733108d258a27799df875ceda2d84c3cafea64d3;hp=0d37b7b8831e52260e299e277537b67c016ec566;hpb=e0389395c168c78560e79c92bcd021a09c3daf30;p=cpPlugins.git

diff --git a/plugins/cpPluginsImageFilters/OrImageFilter.cxx b/plugins/cpPluginsImageFilters/OrImageFilter.cxx
index 0d37b7b..f45774c 100644
--- a/plugins/cpPluginsImageFilters/OrImageFilter.cxx
+++ b/plugins/cpPluginsImageFilters/OrImageFilter.cxx
@@ -19,26 +19,30 @@ cpPluginsImageFilters::OrImageFilter::
 }
 
 // -------------------------------------------------------------------------
-std::string cpPluginsImageFilters::OrImageFilter::
+void cpPluginsImageFilters::OrImageFilter::
 _GenerateData( )
 {
-  auto image = this->GetInputData( "Input0" )->GetITK< itk::DataObject >( );
-  std::string   cpPlugin_Image_Demangle_Pixel_AllInts( r, _GD0, image, 2 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllInts( r, _GD0, image, 3 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllInts( r, _GD0, image, 1 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllInts( r, _GD0, image, 4 );
-  return( r );
+  auto image = this->GetInputData< itk::DataObject >( "Input0" );
+  cpPlugins_Image_Demangle_Pixel_AllInts      ( _GD0, image, 1 );
+  else cpPlugins_Image_Demangle_Pixel_AllInts ( _GD0, image, 2 );
+  else cpPlugins_Image_Demangle_Pixel_AllInts ( _GD0, image, 3 );
+  else cpPlugins_Image_Demangle_Pixel_AllInts ( _GD0, image, 4 );
+  else cpPlugins_Image_Demangle_Pixel_AllUInts( _GD0, image, 1 );
+  else cpPlugins_Image_Demangle_Pixel_AllUInts( _GD0, image, 2 );
+  else cpPlugins_Image_Demangle_Pixel_AllUInts( _GD0, image, 3 );
+  else cpPlugins_Image_Demangle_Pixel_AllUInts( _GD0, image, 4 );
+  else this->_Error( "No valid input image." );
 }
 
 // -------------------------------------------------------------------------
 template< class _TImage >
-std::string cpPluginsImageFilters::OrImageFilter::
+void cpPluginsImageFilters::OrImageFilter::
 _GD0( _TImage* image0 )
 {
   typedef itk::OrImageFilter< _TImage, _TImage > _TFilter;
   if( image0 != NULL )
   {
-    auto image1 = this->GetInputData( "Input1" )->GetITK< _TImage >( );
+    auto image1 = this->GetInputData< _TImage >( "Input1" );
     if( image1 != NULL )
     {
       // Configure filter
@@ -48,18 +52,13 @@ _GD0( _TImage* image0 )
       filter->Update( );
 
       // Connect output
-      this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) );
-      return( "" );
+      this->GetOutput( "Output" )->SetITK( filter->GetOutput( ) );
     }
     else
-      return(
-        "ImageFilters::OrImageFilter: No valid second input image."
-        );
+      this->_Error( "No valid second input image." );
   }
   else
-    return(
-      "ImageFilters::OrImageFilter: No valid first input image."
-      );
+    this->_Error( "No valid first input image." );
 }
 
 // eof - $RCSfile$