itk4 compatibility

diff --git a/itk/clitkComposeVFFilter.h b/itk/clitkComposeVFFilter.h
index d66d819b0c750b4a82447bd52877d09ce690030e..cf1ada2c77678ea0336d8f0662bd6fceec5ad88e 100644 (file)
--- a/itk/clitkComposeVFFilter.h
+++ b/itk/clitkComposeVFFilter.h
@@ -75,7 +75,11 @@ namespace clitk
 
     //========================================================================================
     //Threaded execution should implement generate threaded data
-    void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
+#if ITK_VERSION_MAJOR >= 4
+  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId );
+#else
+  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
+#endif
   
     bool m_Verbose;
     PixelType m_EdgePaddingValue;

diff --git a/itk/clitkComposeVFFilter.txx b/itk/clitkComposeVFFilter.txx
index 7103a1025c40f95828e477823d8c2f2c0fc9554b..a50ca26a38ee2556751e7af18c7a8913e852546a 100644 (file)
--- a/itk/clitkComposeVFFilter.txx
+++ b/itk/clitkComposeVFFilter.txx
@@ -35,8 +35,13 @@ namespace clitk
 
   //=========================================================================================================================
   //update the output for the outputRegionForThread
+#if ITK_VERSION_MAJOR >= 4
+  template<class InputImageType, class OutputImageType> 
+  void ComposeVFFilter<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId )
+#else
   template<class InputImageType, class OutputImageType> 
   void ComposeVFFilter<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId )
+#endif
   {
  
     //Get pointer to the output

diff --git a/itk/clitkInvertVFFilter.txx b/itk/clitkInvertVFFilter.txx
index 684b35545add887b43a3827a6efd9ce8d71577d0..b74958fb597a83dc9b3f559936973b340ee6874d 100644 (file)
--- a/itk/clitkInvertVFFilter.txx
+++ b/itk/clitkInvertVFFilter.txx
@@ -75,7 +75,11 @@ protected:
 
   //the actual processing
   void BeforeThreadedGenerateData();
+#if ITK_VERSION_MAJOR >= 4
+  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId );
+#else
   void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
+#endif
 
   //member data
   typename  WeightsImageType::Pointer m_Weights;
@@ -113,7 +117,11 @@ void HelperClass1<InputImageType, OutputImageType>::BeforeThreadedGenerateData()
 //=========================================================================================================================
 //update the output for the outputRegionForThread
 template<class InputImageType, class OutputImageType>
+#if ITK_VERSION_MAJOR >= 4
+void HelperClass1<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId )
+#else
 void HelperClass1<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId )
+#endif
 {
   //std::cout << "HelperClass1::ThreadedGenerateData - IN" << std::endl;
   //Get pointer to the input
@@ -285,8 +293,11 @@ protected:
 
 
   //the actual processing
+#if ITK_VERSION_MAJOR >= 4
+  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId );
+#else
   void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
-
+#endif
 
   //member data
   typename     WeightsImageType::Pointer m_Weights;
@@ -311,7 +322,11 @@ template<class InputImageType, class OutputImageType > HelperClass2<InputImageTy
 
 //=========================================================================================================================
 //update the output for the outputRegionForThread
+#if ITK_VERSION_MAJOR >= 4
+template<class InputImageType, class OutputImageType > void HelperClass2<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId )
+#else
 template<class InputImageType, class OutputImageType > void HelperClass2<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId )
+#endif
 {
   //std::cout << "HelperClass2::ThreadedGenerateData - IN" << std::endl;
   

diff --git a/tools/clitkVectorImageToImageFilter.h b/tools/clitkVectorImageToImageFilter.h
index cf5946e3849e4adac4fd5ed3d74a3c02422f33d5..e2971f4e1962a34fb6aea5067dcfbb0b7b7e46ba 100644 (file)
--- a/tools/clitkVectorImageToImageFilter.h
+++ b/tools/clitkVectorImageToImageFilter.h
@@ -86,7 +86,11 @@ namespace clitk
     //----------------------------------------  
     // Update
     //----------------------------------------  
+#if ITK_VERSION_MAJOR >= 4
+    void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, itk::ThreadIdType threadId );
+#else
     void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, int threadId );
+#endif
    
     //----------------------------------------  
     // Data members

diff --git a/tools/clitkVectorImageToImageFilter.txx b/tools/clitkVectorImageToImageFilter.txx
index 909a42290e3a84ba556889972f24d5f93eceb718..539e8dced07cb13b989d63b654b8f7444a8617d5 100644 (file)
--- a/tools/clitkVectorImageToImageFilter.txx
+++ b/tools/clitkVectorImageToImageFilter.txx
@@ -47,7 +47,11 @@ namespace clitk
   //-------------------------------------------------------------------
   template<class InputImageType, class  OutputImageType> 
   void 
+#if ITK_VERSION_MAJOR >= 4
+  VectorImageToImageFilter<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, itk::ThreadIdType threadId)
+#else
   VectorImageToImageFilter<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, int threadId)
+#endif
   {
     // Iterators
     typename OutputImageType::Pointer output=this->GetOutput();