MAC compilation issues solved... Now some tests please

[cpPlugins.git] / lib / cpPlugins / Plugins / BasicFilters / MacheteImageFilter.cxx

diff --git a/lib/cpPlugins/Plugins/BasicFilters/MacheteImageFilter.cxx b/lib/cpPlugins/Plugins/BasicFilters/MacheteImageFilter.cxx
index e40ecb192c76217e4b05f44677cac80f1e655ee9..7f9d251523494fd0e97f246f0f4727a3a9440ac6 100644 (file)
--- a/lib/cpPlugins/Plugins/BasicFilters/MacheteImageFilter.cxx
+++ b/lib/cpPlugins/Plugins/BasicFilters/MacheteImageFilter.cxx
@@ -12,8 +12,8 @@ cpPlugins::BasicFilters::MacheteImageFilter::
 MacheteImageFilter()
 : Superclass()
 {
-  this->_AddInput("Input");
-  this->_MakeOutput< cpPlugins::Interface::Image >("Output");
+  this->_AddInput( "Input" );
+  this->_AddOutput< cpPlugins::Interface::Image >("Output");
 
   this->m_Parameters->ConfigureAsReal("Radius");
   //this->m_Parameters->ConfigureAsPoint("Point", 3, 3);
@@ -38,11 +38,7 @@ cpPlugins::BasicFilters::MacheteImageFilter::
 std::string cpPlugins::BasicFilters::MacheteImageFilter::
 _GenerateData()
 {
-  cpPlugins::Interface::Image* image =
-    this->GetInput< cpPlugins::Interface::Image >("Input");
-  if (image == NULL)
-    return("MacheteImageFilter: No input image.");
-
+  auto image = this->GetInputData< cpPlugins::Interface::Image >("Input");
   itk::DataObject* itk_image = NULL;
   std::string r = "";
   cpPlugins_Image_Demangle_AllScalarTypes(2, image, itk_image, r, _GD0);
@@ -59,8 +55,8 @@ _GD0(itk::DataObject* image)
 {
   return(
     this->_RealGD< I, itk::Image< unsigned char, I::ImageDimension > >(
-    image
-    )
+      image
+      )
     );
 }
 
@@ -90,15 +86,9 @@ _RealGD(itk::DataObject* image)
   filter->Update();
 
   // Connect output
-  cpPlugins::Interface::Image* out =
-    this->GetOutput< cpPlugins::Interface::Image >("Output");
-  if (out != NULL)
-  {
-    out->SetITK< O >( filter->GetOutput( ) );
-    return("");
-  }
-  else
-    return("MacheteImageFilter: output not correctly created.");
+  auto out = this->GetOutputData< cpPlugins::Interface::Image >("Output");
+  out->SetITK( filter->GetOutput( ) );
+  return("");
 }
 
 // eof - $RCSfile$