More bugs smashed

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

diff --git a/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx b/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx
index fcb03cd0cc0857ea7a2fa8d62b9bbfc73362027b..fcdb2553f4914c61328a3fdd71457be7872b5727 100644 (file)
--- a/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx
+++ b/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx
@@ -1,13 +1,16 @@
 #include <cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.h>
 #include <cpPlugins/Image.h>
+#include <cpPlugins_ITKInstances/ImageFilters.h>
 
 #include <itkSignedMaurerDistanceMapImageFilter.h>
 #include <itkSignedMaurerDistanceMapImageFilter.hxx>
-#include <itkBinaryThresholdImageFilter.hxx>
-#include <itkImageToImageFilter.hxx>
-#include <itkInPlaceImageFilter.hxx>
-#include <itkUnaryFunctorImageFilter.hxx>
-#include <itkBinaryContourImageFilter.hxx>
+/*
+  #include <itkBinaryThresholdImageFilter.hxx>
+  #include <itkImageToImageFilter.hxx>
+  #include <itkInPlaceImageFilter.hxx>
+  #include <itkUnaryFunctorImageFilter.hxx>
+  #include <itkBinaryContourImageFilter.hxx>
+*/
 
 // -------------------------------------------------------------------------
 cpPluginsImageFilters::SignedMaurerDistanceMapImageFilter::
@@ -51,9 +54,9 @@ _GenerateData( )
 }
 
 // -------------------------------------------------------------------------
-template< class I >
+template< class _TImage >
 std::string cpPluginsImageFilters::SignedMaurerDistanceMapImageFilter::
-_GD0( I* image )
+_GD0( _TImage* image )
 {
   if( image != NULL )
   {
@@ -61,11 +64,11 @@ _GD0( I* image )
       this->m_Parameters.GetSelectedChoice( "OutputResolution" );
     if( out_res == "float" )
       return(
-        this->_GD1< I, itk::Image< float, I::ImageDimension > >( image )
+        this->_GD1< _TImage, itk::Image< float, _TImage::ImageDimension > >( image )
         );
   else if( out_res == "double" )
     return(
-      this->_GD1< I, itk::Image< double, I::ImageDimension > >( image )
+      this->_GD1< _TImage, itk::Image< double, _TImage::ImageDimension > >( image )
       );
   else
     return( "ImageFilters::SignedMaurerDistanceMapImageFilter: Output resolution not supported." );
@@ -77,11 +80,11 @@ _GD0( I* image )
 }
 
 // -------------------------------------------------------------------------
-template< class I, class O >
+template< class _TImage, class _TDMap >
 std::string cpPluginsImageFilters::SignedMaurerDistanceMapImageFilter::
-_GD1( I* image )
+_GD1( _TImage* image )
 {
-  typedef itk::SignedMaurerDistanceMapImageFilter< I, O > _F;
+  typedef itk::SignedMaurerDistanceMapImageFilter< _TImage, _TDMap > _F;
 
   // Get parameters
   double back_value = this->m_Parameters.GetReal( "BackgroundValue" );
@@ -92,7 +95,7 @@ _GD1( I* image )
   // Configure filter
   _F* filter = this->_CreateITK< _F >( );
   filter->SetInput( image );
-  filter->SetBackgroundValue( ( typename I::PixelType )( back_value ) );
+  filter->SetBackgroundValue( ( typename _TImage::PixelType )( back_value ) );
   filter->SetInsideIsPositive( pos_inside );
   filter->SetSquaredDistance( sqr_dist );
   filter->SetUseImageSpacing( use_spac );