X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FRelativePositionPropImageFilter.h;h=05172245ba70114bcf5e696bcc6fdac1e58ed7d3;hb=578e4e5a84a390592ba6b2a7e8bff22dba19ccd0;hp=93a3aa303541299be87153742d1eb0c538a03f3e;hpb=765020625fbc092d283e221e36c83e60a1844cb7;p=clitk.git

diff --git a/itk/RelativePositionPropImageFilter.h b/itk/RelativePositionPropImageFilter.h
index 93a3aa3..0517224 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 > 
   {
@@ -187,7 +194,7 @@ namespace itk
     virtual ~RelativePositionPropImageFilter() {}
     void PrintSelf(std::ostream& os, Indent indent) const;
 
-    //void GenerateThreadedData(const typename TOutputImage::RegionType& outputRegionForThread, int threadId);
+    //void GenerateThreadedData(const typename TOutputImage::RegionType& outputRegionForThread, ThreadIdType threadId);
     void GenerateData();
 
   private: