itkv4 migration use itk::ThreadIdType

diff --git a/itk/clitkBackProjectImageFilter.h b/itk/clitkBackProjectImageFilter.h
index 7de71a116111326f2bed06060af31bc165a6ecb5..689e67852d0bf3fd5bd93d32ff0493dbc6d42ab7 100644 (file)
--- a/itk/clitkBackProjectImageFilter.h
+++ b/itk/clitkBackProjectImageFilter.h
@@ -242,7 +242,11 @@ namespace clitk
     void BeforeThreadedGenerateData(void );
   
     // Threaded Generate Data
+#if ITK_VERSION_MAJOR >= 4
+    void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, itk::ThreadIdType threadId );
+#else
     void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, int threadId );
+#endif
 
  
     //------------------------------------------------

diff --git a/itk/clitkBackProjectImageFilter.txx b/itk/clitkBackProjectImageFilter.txx
index c07033602c188e1075bd931bf69991727f25083b..b1f84e260426db6becc2a0261be699742ee759da 100644 (file)
--- a/itk/clitkBackProjectImageFilter.txx
+++ b/itk/clitkBackProjectImageFilter.txx
@@ -303,7 +303,11 @@ namespace clitk
   template <class InputImageType, class OutputImageType>
   void 
   BackProjectImageFilter<InputImageType, OutputImageType>
+#if ITK_VERSION_MAJOR >= 4
+  ::ThreadedGenerateData( const OutputImageRegionType & outputRegionForThread,  itk::ThreadIdType threadId )
+#else
   ::ThreadedGenerateData( const OutputImageRegionType & outputRegionForThread,  int threadId )
+#endif
   {
     //Projection pointer
     InputImageConstPointer inputPtr=this->GetInput();

diff --git a/itk/clitkExtractImageFilter.h b/itk/clitkExtractImageFilter.h
index 7ea101adc2edbaba0f74e4f9becaa6be367b9b13..ce31fd9c915ebdb12f552f8e58809b312ba26463 100644 (file)
--- a/itk/clitkExtractImageFilter.h
+++ b/itk/clitkExtractImageFilter.h
@@ -94,8 +94,12 @@ protected:
                                                  const OutputImageRegionType &srcRegion);
 
 
-  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
+
   InputImageRegionType m_ExtractionRegion;
   OutputImageRegionType m_OutputImageRegion;
 

diff --git a/itk/clitkExtractImageFilter.txx b/itk/clitkExtractImageFilter.txx
index 236a7cb0c1d3178eaa29eb999a264f79f99d3190..90fee3bbd49f312a120373da966ae0bbc845b5cf 100644 (file)
--- a/itk/clitkExtractImageFilter.txx
+++ b/itk/clitkExtractImageFilter.txx
@@ -236,8 +236,11 @@ ExtractImageFilter<TInputImage,TOutputImage>
 template <class TInputImage, class TOutputImage>
 void 
 ExtractImageFilter<TInputImage,TOutputImage>
-::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
-                       int threadId)
+#if ITK_VERSION_MAJOR >= 4
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+#else
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
+#endif
 {
   itkDebugMacro(<<"Actually executing");