From: Romulo Pinho <romulo.pinho@lyon.unicancer.fr>
Date: Tue, 21 Feb 2012 14:13:19 +0000 (+0100)
Subject: itk4 compatibility
X-Git-Tag: v1.3.0~97
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f0adfdc4ba7f1cab53381fa4b6e75aaf63ab7744;p=clitk.git

itk4 compatibility
---

diff --git a/itk/itkFlexibleBinaryFunctorImageFilter.h b/itk/itkFlexibleBinaryFunctorImageFilter.h
index c51ab0c..18062a2 100644
--- a/itk/itkFlexibleBinaryFunctorImageFilter.h
+++ b/itk/itkFlexibleBinaryFunctorImageFilter.h
@@ -145,8 +145,13 @@ protected:
    *
    * \sa ImageToImageFilter::ThreadedGenerateData(),
    *     ImageToImageFilter::GenerateData()  */
+#if ITK_VERSION_MAJOR >= 4  
+  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
+                            itk::ThreadIdType threadId );
+#else
   void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
                             int threadId );
+#endif
 
 private:
   FlexibleBinaryFunctorImageFilter(const Self&); //purposely not implemented
diff --git a/itk/itkFlexibleBinaryFunctorImageFilter.txx b/itk/itkFlexibleBinaryFunctorImageFilter.txx
index 0914787..f8c7a75 100644
--- a/itk/itkFlexibleBinaryFunctorImageFilter.txx
+++ b/itk/itkFlexibleBinaryFunctorImageFilter.txx
@@ -98,7 +98,11 @@ template <class TInputImage1, class TInputImage2, class TOutputImage, class TFun
 void
 FlexibleBinaryFunctorImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
 ::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread,
+#if ITK_VERSION_MAJOR >= 4  
+                        itk::ThreadIdType threadId )
+#else
                         int threadId)
+#endif
 {
   const unsigned int dim = Input1ImageType::ImageDimension;