...

[cpPlugins.git] / plugins / ImageGenericFilters / RescaleIntensityImageFilter.cxx

diff --git a/plugins/ImageGenericFilters/RescaleIntensityImageFilter.cxx b/plugins/ImageGenericFilters/RescaleIntensityImageFilter.cxx
index 01ccdbc77a4668295d992a1d3d092acc4c2975a1..a484a62a1bff4eba664df0f68c8a2efbe64767d2 100644 (file)
--- a/plugins/ImageGenericFilters/RescaleIntensityImageFilter.cxx
+++ b/plugins/ImageGenericFilters/RescaleIntensityImageFilter.cxx
@@ -1,24 +1,20 @@
-#include <plugins/ImageGenericFilters/RescaleIntensityImageFilter.h>
+#include <ImageGenericFilters/RescaleIntensityImageFilter.h>
 #include <cpPlugins/DataObjects/Image.h>
+#include <cpPlugins/DataObjects/Image_Demanglers.h>
 
 #include <itkRescaleIntensityImageFilter.h>
-#include <itkRescaleIntensityImageFilter.hxx>
-#include <itkUnaryFunctorImageFilter.hxx>
-#include <itkMinimumMaximumImageCalculator.hxx>
 
 // -------------------------------------------------------------------------
 cpPluginsImageGenericFilters::RescaleIntensityImageFilter::
 RescaleIntensityImageFilter( )
   : Superclass( )
 {
-  this->_ConfigureInput< cpPlugins::DataObjects::Image >( "Input", true, false );
-  this->_ConfigureOutput< cpPlugins::DataObjects::Image >( "Output" );
+  typedef cpPlugins::DataObjects::Image _TImage;
+  this->_ConfigureInput< _TImage >( "Input", true, false );
+  this->_ConfigureOutput< _TImage >( "Output" );
 
-  this->m_Parameters.ConfigureAsReal( "OutputMinimum" );
-  this->m_Parameters.ConfigureAsReal( "OutputMaximum" );
-
-  this->m_Parameters.SetReal( "OutputMinimum", 0 );
-  this->m_Parameters.SetReal( "OutputMaximum", 1 );
+  this->m_Parameters.ConfigureAsReal( "OutputMinimum", 0 );
+  this->m_Parameters.ConfigureAsReal( "OutputMaximum", 1 );
 }
 
 // -------------------------------------------------------------------------
@@ -32,8 +28,8 @@ void cpPluginsImageGenericFilters::RescaleIntensityImageFilter::
 _GenerateData( )
 {
   auto o = this->GetInputData( "Input" );
-  cpPlugins_Demangle_ImageScalars_Dims( o, _GD0 );
-  else this->_Error( "Invalid input image." );
+  cpPlugins_Demangle_Image_ScalarPixels_AllDims_1( o, _GD0 )
+    this->_Error( "Invalid input image." );
 }
 
 // -------------------------------------------------------------------------