X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=plugins%2Ffpa%2FGradientBaseImageFunctionSource.cxx;h=85a79ce168a59485b7f4579532485514546f2433;hb=e832f438861464a8d521464b61be7e31c896adb8;hp=926523d9dcdbe162e439d5253f87b0392ba39fe2;hpb=aaeabf9e79b8db1b97bc3381e95e46c77da4d891;p=FrontAlgorithms.git

diff --git a/plugins/fpa/GradientBaseImageFunctionSource.cxx b/plugins/fpa/GradientBaseImageFunctionSource.cxx
index 926523d..85a79ce 100644
--- a/plugins/fpa/GradientBaseImageFunctionSource.cxx
+++ b/plugins/fpa/GradientBaseImageFunctionSource.cxx
@@ -35,38 +35,34 @@ fpaPlugins::GradientBaseImageFunctionSource::
 }
 
 // -------------------------------------------------------------------------
-std::string fpaPlugins::GradientBaseImageFunctionSource::
+void fpaPlugins::GradientBaseImageFunctionSource::
 _GenerateData( )
 {
-  auto image = this->GetInputData( "Input" )->GetITK< itk::DataObject >( );
-  std::string   cpPlugin_Image_Demangle_VectorPixel_AllFloats( r, _GD0, image, itk::CovariantVector, 2 );
-  if( r != "" ) cpPlugin_Image_Demangle_VectorPixel_AllFloats( r, _GD0, image, itk::CovariantVector, 3 );
-  return( r );
+  auto image = this->GetInputData< itk::DataObject >( "Input" );
+  cpPlugins_Image_Demangle_VectorPixel_AllFloats     ( _GD0, image, CovariantVector, 2 );
+  else cpPlugins_Image_Demangle_VectorPixel_AllFloats( _GD0, image, CovariantVector, 3 );
+  else this->_Error( "Invalid input image." );
 }
 
 // -------------------------------------------------------------------------
 template< class _TImage >
-std::string fpaPlugins::GradientBaseImageFunctionSource::
+void fpaPlugins::GradientBaseImageFunctionSource::
 _GD0( _TImage* image )
 {
   typedef fpa::Image::Functors::GulsunTekMedialness< _TImage > _TGT;
   typedef fpa::Image::Functors::FluxMedialness< _TImage > _TFl;
   typedef fpa::Image::Functors::MFluxMedialness< _TImage > _TMFl;
 
-  if( image == NULL )
-    return( "GradientBaseImageFunctionSource: Invalid input image." );
-
   auto ft = this->m_Parameters.GetSelectedChoice( "FunctionType" );
-  if     ( ft == "Gulsun&Tek" ) return( this->_GD1< _TImage, _TGT >( image ) );
-  else if( ft == "Flux" )       return( this->_GD1< _TImage, _TFl >( image ) );
-  else if( ft == "MFlux" )      return( this->_GD1< _TImage, _TMFl >( image ) );
-  else
-    return( "GradientBaseImageFunctionSource: Invalid function type." );
+  if     ( ft == "Gulsun&Tek" ) this->_GD1< _TImage, _TGT >( image );
+  else if( ft == "Flux" )       this->_GD1< _TImage, _TFl >( image );
+  else if( ft == "MFlux" )      this->_GD1< _TImage, _TMFl >( image );
+  else this->_Error( "Invalid function type." );
 }
 
 // -------------------------------------------------------------------------
 template< class _TImage, class _TFunction >
-std::string fpaPlugins::GradientBaseImageFunctionSource::
+void fpaPlugins::GradientBaseImageFunctionSource::
 _GD1( _TImage* image )
 {
   typedef itk::Image< typename _TFunction::TOutput, _TImage::ImageDimension > _TOutImage;
@@ -91,8 +87,7 @@ _GD1( _TImage* image )
   filter->Update( );
 
   // Connect output and finish
-  this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) );
-  return( "" );
+  this->GetOutput( "Output" )->SetITK( filter->GetOutput( ) );
 }
 
 // eof - $RCSfile$