From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Tue, 17 May 2011 08:06:24 +0000 (+0200)
Subject: itk4 migration
X-Git-Tag: v1.2.1~29^2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=efa4f417d1f3904828d7a3d7b00d2b7984e058af;p=clitk.git

itk4 migration

- Function namespace renamed into Functor in itkMinimumImageFilter.h
---

diff --git a/itk/RelativePositionPropImageFilter.h b/itk/RelativePositionPropImageFilter.h
index 93a3aa3..11797e7 100644
--- a/itk/RelativePositionPropImageFilter.h
+++ b/itk/RelativePositionPropImageFilter.h
@@ -80,11 +80,18 @@ namespace itk
    *   
    *   This filter is implemented using the propagation algorithm
    */
- 
+
+#if ITK_VERSION_MAJOR == 4
+  template <class TInputImage, class TOutputImage, class TtNorm=Functor::Minimum<
+                                                     typename TOutputImage::PixelType,
+                                                     typename TOutputImage::PixelType,
+                                                     typename TOutputImage::PixelType>  >
+#else
   template <class TInputImage, class TOutputImage, class TtNorm=Function::Minimum<
                                                      typename TOutputImage::PixelType,
                                                      typename TOutputImage::PixelType,
                                                      typename TOutputImage::PixelType>  >
+#endif
   class ITK_EXPORT RelativePositionPropImageFilter :
     public ImageToImageFilter< TInputImage, TOutputImage > 
   {