itk4 compatibility

diff --git a/itk/itkFlexibleBinaryFunctorImageFilter.h b/itk/itkFlexibleBinaryFunctorImageFilter.h
index c51ab0ce652d31c1d8be969af6449789f7c8303c..18062a2296302fbebc2f922cbc65e920e652d1bc 100644 (file)
--- 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 09147878ce69130bfeb093a81d06e5f2103a5d34..f8c7a753a1eeb0572975c7bb85ae493112b598ad 100644 (file)
--- 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;