From ddbe9fd0417fa9a828b785c43dace6dedb8f4274 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Fri, 26 Jun 2015 14:47:17 -0400
Subject: [PATCH] COMP: Use overload dispatch in StructureTensorImageFilter.

This is for:

  c:\jenkins\workspace\itkgerritwindows\itk-src\modules\remote\anisotropicdiffusionlbr\include\itkStructureTensorImageFilter.h(95)
  : warning C4348:
  'itk::StructureTensorImageFilter,itk::Image>::IntermediateFilter' :
  redefinition of default parameter : parameter 1

on MSVC.
---
 include/itkStructureTensorImageFilter.h   |  8 +++-
 include/itkStructureTensorImageFilter.hxx | 56 ++++++++++-------------
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/include/itkStructureTensorImageFilter.h b/include/itkStructureTensorImageFilter.h
index 63aefaf..191605b 100644
--- a/include/itkStructureTensorImageFilter.h
+++ b/include/itkStructureTensorImageFilter.h
@@ -92,8 +92,12 @@ class StructureTensorImageFilter:
   ScalarType m_PostRescaling;
   bool       m_UseGradientRecursiveGaussianImageFilter;
 
-  template< typename Dummy=void, bool b=std::numeric_limits<PixelType>::is_specialized >
-  struct IntermediateFilter;
+  struct DispatchBase {};
+  template< bool >
+  struct Dispatch: public DispatchBase {};
+
+  void IntermediateFilter( const Dispatch< true > & );
+  void IntermediateFilter( const Dispatch< false > & );
   typename TensorImageType::Pointer m_IntermediateResult;
 
   typedef CovariantVector<ScalarType,Dimension> CovariantVectorType;
diff --git a/include/itkStructureTensorImageFilter.hxx b/include/itkStructureTensorImageFilter.hxx
index 3ca2a75..0132a52 100644
--- a/include/itkStructureTensorImageFilter.hxx
+++ b/include/itkStructureTensorImageFilter.hxx
@@ -40,37 +40,30 @@ StructureTensorImageFilter< TImage, TTensorImage >
 
 
 template< typename TImage, typename TTensorImage >
-template< typename Dummy >
-struct StructureTensorImageFilter< TImage, TTensorImage >
-::IntermediateFilter< Dummy, true >
+void
+StructureTensorImageFilter< TImage, TTensorImage >
+::IntermediateFilter( const Dispatch< true > & )
 {
-  typedef StructureTensorImageFilter< TImage, TTensorImage > Self;
-  void operator()(Self *self)
-  {
-    typedef GradientRecursiveGaussianImageFilter< TImage, Self::CovariantImageType > GradientFilterType;
-    typename GradientFilterType::Pointer gradientFilter = GradientFilterType::New();
-    gradientFilter->SetInput(self->GetInput());
-    gradientFilter->SetSigma(self->m_NoiseScale);
+  typedef GradientRecursiveGaussianImageFilter< TImage, Self::CovariantImageType > GradientFilterType;
+  typename GradientFilterType::Pointer gradientFilter = GradientFilterType::New();
+  gradientFilter->SetInput(this->GetInput());
+  gradientFilter->SetSigma(this->m_NoiseScale);
 
-    typedef UnaryFunctorImageFilter< Self::CovariantImageType, Self::TensorImageType, Self::OuterFunctor > OuterFilterType;
-    typename OuterFilterType::Pointer outerFilter = OuterFilterType::New();
-    outerFilter->SetInput(gradientFilter->GetOutput());
+  typedef UnaryFunctorImageFilter< Self::CovariantImageType, Self::TensorImageType, Self::OuterFunctor > OuterFilterType;
+  typename OuterFilterType::Pointer outerFilter = OuterFilterType::New();
+  outerFilter->SetInput(gradientFilter->GetOutput());
 
-    outerFilter->Update();
-    self->m_IntermediateResult = outerFilter->GetOutput();
-  }
-};
+  outerFilter->Update();
+  this->m_IntermediateResult = outerFilter->GetOutput();
+}
 
 
 template< typename TImage, typename TTensorImage >
-template< typename Dummy >
-struct StructureTensorImageFilter< TImage, TTensorImage >
-::IntermediateFilter< Dummy, false >
+void
+StructureTensorImageFilter< TImage, TTensorImage >
+::IntermediateFilter( const Dispatch< false > & )
 {
-  typedef StructureTensorImageFilter< TImage, TTensorImage > Self;
-  void operator()(Self *self)
-  {
-  typename Self::ImageType::ConstPointer input = self->GetInput();
+  typename Self::ImageType::ConstPointer input = this->GetInput();
   typename Self::TensorImageType::Pointer output = Self::TensorImageType::New();
   output->CopyInformation(input);
   output->SetRegions(input->GetRequestedRegion());
@@ -92,13 +85,13 @@ struct StructureTensorImageFilter< TImage, TTensorImage >
     typename GradientFilterType::Pointer gradientFilter = GradientFilterType::New();
     typename GradientGaussianFilterType::Pointer gradientGaussianFilter = GradientGaussianFilterType::New();
 
-    gaussianFilter->SetSigma(self->m_NoiseScale);
-    gradientGaussianFilter->SetSigma(self->m_NoiseScale);
+    gaussianFilter->SetSigma(this->m_NoiseScale);
+    gradientGaussianFilter->SetSigma(this->m_NoiseScale);
 
     typedef UnaryFunctorImageFilter< Self::CovariantImageType, Self::TensorImageType, Self::OuterFunctor > OuterFilterType;
     typename OuterFilterType::Pointer outerFilter = OuterFilterType::New();
 
-    if( self->m_UseGradientRecursiveGaussianImageFilter )
+    if( this->m_UseGradientRecursiveGaussianImageFilter )
       {
       gradientGaussianFilter->SetInput(selectionFilter->GetOutput());
       outerFilter->SetInput(gradientGaussianFilter->GetOutput());
@@ -118,11 +111,10 @@ struct StructureTensorImageFilter< TImage, TTensorImage >
     addFilter->Update();
     output = addFilter->GetOutput();
 
-    self->UpdateProgress(index/float( Self::PixelType::Dimension+1 ));
+    this->UpdateProgress(index/float( Self::PixelType::Dimension+1 ));
     }
-    self->m_IntermediateResult = output;
-  }
-};
+  this->m_IntermediateResult = output;
+}
 
 
 template< typename TImage, typename TTensorImage >
@@ -130,7 +122,7 @@ void
 StructureTensorImageFilter< TImage, TTensorImage >
 ::GenerateData()
 {
-  IntermediateFilter<>()(this);
+  this->IntermediateFilter( Dispatch< std::numeric_limits< PixelType >::is_specialized >() );
 
   typedef RecursiveGaussianImageFilter<TensorImageType> GaussianFilterType;
   typename GaussianFilterType::Pointer gaussianFilter = GaussianFilterType::New();