From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Mon, 7 May 2012 11:33:19 +0000 (+0200)
Subject: itkv4 migration use itk::ThreadIdType
X-Git-Tag: v1.3.0~41^2~2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=5f9b1f66850a409e87c1e131e8ae09a3541f05fe;p=clitk.git

itkv4 migration use itk::ThreadIdType
---

diff --git a/itk/clitkBackProjectImageFilter.h b/itk/clitkBackProjectImageFilter.h
index 7de71a1..689e678 100644
--- 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 c070336..b1f84e2 100644
--- 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 7ea101a..ce31fd9 100644
--- 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 236a7cb..90fee3b 100644
--- 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");