...

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

diff --git a/plugins/cpPluginsImageFilters/ResampleImageFilter.cxx b/plugins/cpPluginsImageFilters/ResampleImageFilter.cxx
index 8c9a8dd2eb070a0c518d917f154a92e24bf3c0a4..8508189e2371f9ab34187938266dfb7606b92292 100644 (file)
--- a/plugins/cpPluginsImageFilters/ResampleImageFilter.cxx
+++ b/plugins/cpPluginsImageFilters/ResampleImageFilter.cxx
@@ -23,42 +23,36 @@ cpPluginsImageFilters::ResampleImageFilter::
 }
 
 // -------------------------------------------------------------------------
-std::string cpPluginsImageFilters::ResampleImageFilter::
+void cpPluginsImageFilters::ResampleImageFilter::
 _GenerateData( )
 {
   auto image = this->GetInputData( "Input" )->GetITK< itk::DataObject >( );
-  std::string   cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 2 );
-  if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 3 );
-  /* TODO
-     if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 1 );
-     if( r != "" ) cpPlugin_Image_Demangle_Pixel_AllScalars( r, _GD0, image, 4 );
-  */
-  return( r );
+  cpPlugins_Image_Demangle_Pixel_AllScalars     ( _GD0, image, 2 );
+  else cpPlugins_Image_Demangle_Pixel_AllScalars( _GD0, image, 3 );
+  else this->_Error( "No valid input image." );
 }
 
 // -------------------------------------------------------------------------
 template< class _TImage >
-std::string cpPluginsImageFilters::ResampleImageFilter::
+void cpPluginsImageFilters::ResampleImageFilter::
 _GD0( _TImage* image )
 {
   if( image != NULL )
   {
     auto choice = this->m_Parameters.GetSelectedChoice( "OutputResolution" );
     if( choice == "float" )
-      return( this->_GD1< _TImage, float >( image ) );
+      this->_GD1< _TImage, float >( image );
     else if( choice == "double" )
-      return( this->_GD1< _TImage, double >( image ) );
-    else return( "ResampleImageFilter: no valid scalar type." );
+      this->_GD1< _TImage, double >( image );
+    else this->_Error( "No valid scalar type." );
   }
   else
-    return(
-      "ResampleImageFilter: No valid input image."
-      );
+    this->_Error( "No valid input image." );
 }
 
 // -------------------------------------------------------------------------
 template< class _TImage, class _TScalar >
-std::string cpPluginsImageFilters::ResampleImageFilter::
+void cpPluginsImageFilters::ResampleImageFilter::
 _GD1( _TImage* image )
 {
   typedef
@@ -66,9 +60,7 @@ _GD1( _TImage* image )
     _TFilter;
 
   if( image == NULL )
-    return(
-      "ImageFilters::ResampleImageFilter: No valid input image."
-      );
+    this->_Error( "No valid input image." );
 
   // Configure filter
   _TFilter* filter = this->_CreateITK< _TFilter >( );
@@ -76,7 +68,6 @@ _GD1( _TImage* image )
 
   // Connect output
   this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) );
-  return( "" );
 }
 
 // eof - $RCSfile$