...

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

diff --git a/plugins/cpPluginsImageFilters/BinaryContourImageFilter.cxx b/plugins/cpPluginsImageFilters/BinaryContourImageFilter.cxx
index 41bf3efb07d719962682793e91cd5d46eca50aa7..2d45cd43f2938f53414692fd9288226c8cc69ba0 100644 (file)
--- a/plugins/cpPluginsImageFilters/BinaryContourImageFilter.cxx
+++ b/plugins/cpPluginsImageFilters/BinaryContourImageFilter.cxx
@@ -31,46 +31,37 @@ cpPluginsImageFilters::BinaryContourImageFilter::
 }
 
 // -------------------------------------------------------------------------
-std::string cpPluginsImageFilters::BinaryContourImageFilter::
+void cpPluginsImageFilters::BinaryContourImageFilter::
 _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 );
-  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::BinaryContourImageFilter::
+void cpPluginsImageFilters::BinaryContourImageFilter::
 _GD0( _TImage* image )
 {
+  static const unsigned int D = _TImage::ImageDimension;
   if( image != NULL )
   {
     std::string out_res =
       this->m_Parameters.GetSelectedChoice( "OutputResolution" );
     if( out_res == "float" )
-      return(
-        this->_GD1< _TImage, itk::Image< float, _TImage::ImageDimension > >(
-          image
-          )
-        );
+      this->_GD1< _TImage, itk::Image< float, D > >( image );
     else // if( out_res == "double" )
-      return(
-        this->_GD1< _TImage, itk::Image< double, _TImage::ImageDimension > >(
-          image
-          )
-        );
+      this->_GD1< _TImage, itk::Image< double, D > >( image );
   }
   else
-    return(
-      "ImageFilters::BinaryContourImageFilter: No valid input image."
-      );
+    this->_Error( "No valid input image." );
 }
 
 // -------------------------------------------------------------------------
 template< class _TImage, class _TContourImage >
-std::string cpPluginsImageFilters::BinaryContourImageFilter::
+void cpPluginsImageFilters::BinaryContourImageFilter::
 _GD1( _TImage* image )
 {
   typedef itk::BinaryContourImageFilter< _TImage, _TContourImage > _F;
@@ -90,7 +81,6 @@ _GD1( _TImage* image )
 
   // Connect output
   this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) );
-  return( "" );
 }
 
 // eof - $RCSfile$