...

[cpPlugins.git] / plugins / cpPluginsImageFilters / AndImageFilter.cxx

diff --git a/plugins/cpPluginsImageFilters/AndImageFilter.cxx b/plugins/cpPluginsImageFilters/AndImageFilter.cxx
index e8057985407f337ad610992000a7cdcb39c781f7..ecb6a37c66c5c298cb5246786c091fdbf0aa60b1 100644 (file)
--- a/plugins/cpPluginsImageFilters/AndImageFilter.cxx
+++ b/plugins/cpPluginsImageFilters/AndImageFilter.cxx
@@ -19,20 +19,24 @@ cpPluginsImageFilters::AndImageFilter::
 }
 
 // -------------------------------------------------------------------------
-std::string cpPluginsImageFilters::AndImageFilter::
+void cpPluginsImageFilters::AndImageFilter::
 _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 );
+  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::AndImageFilter::
+void cpPluginsImageFilters::AndImageFilter::
 _GD0( _TImage* image0 )
 {
   typedef itk::AndImageFilter< _TImage, _TImage > _TFilter;
@@ -49,17 +53,12 @@ _GD0( _TImage* image0 )
 
       // Connect output
       this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) );
-      return( "" );
     }
     else
-      return(
-        "ImageFilters::AndImageFilter: No valid second input image."
-        );
+      this->_Error( "No valid second input image." );
   }
   else
-    return(
-      "ImageFilters::AndImageFilter: No valid first input image."
-      );
+    this->_Error( "No valid first input image." );
 }
 
 // eof - $RCSfile$