Revert "itkv4 migration use itk::ThreadIdType"

This reverts commit a6957c4825e83c61b977ec316dd841878617ffbd.

diff --git a/common/clitkCommon.h b/common/clitkCommon.h
index 11a6255955e8b2185c25b49334bd64158d58a8dc..769ca63f0bf4400cbb783cf53d3bd7b44b3fc293 100644 (file)
--- a/common/clitkCommon.h
+++ b/common/clitkCommon.h
@@ -42,13 +42,6 @@
 #  include <windows.h>
 #endif
 
-#if ITK_VERSION_MAJOR < 4
-namespace itk
-{
-  typedef unsigned int ThreadIdType;
-}
-#endif
-
 //--------------------------------------------------------------------
 namespace clitk {
 

diff --git a/itk/RelativePositionPropImageFilter.h b/itk/RelativePositionPropImageFilter.h
index 05172245ba70114bcf5e696bcc6fdac1e58ed7d3..11797e78d72ed449edddafc67d1873f7b2a1a3d1 100644 (file)
--- a/itk/RelativePositionPropImageFilter.h
+++ b/itk/RelativePositionPropImageFilter.h
@@ -194,7 +194,7 @@ namespace itk
     virtual ~RelativePositionPropImageFilter() {}
     void PrintSelf(std::ostream& os, Indent indent) const;
 
-    //void GenerateThreadedData(const typename TOutputImage::RegionType& outputRegionForThread, ThreadIdType threadId);
+    //void GenerateThreadedData(const typename TOutputImage::RegionType& outputRegionForThread, int threadId);
     void GenerateData();
 
   private:

diff --git a/itk/RelativePositionPropImageFilter.txx b/itk/RelativePositionPropImageFilter.txx
index 8e677b9f38f67a2ce80bbeccb1dc742ad980e032..15a5773cd802648533cc96343ddd0b29f04cd736 100644 (file)
--- a/itk/RelativePositionPropImageFilter.txx
+++ b/itk/RelativePositionPropImageFilter.txx
@@ -82,7 +82,7 @@ namespace itk
   template< class TInputImage, class TOutputImage ,class TtNorm>
   void
   RelativePositionPropImageFilter< TInputImage, TOutputImage ,TtNorm>
-  //::GenerateThreadedData(const typename TOutputImage::RegionType& outputRegionForThread, ThreadIdType threadId)
+  //::GenerateThreadedData(const typename TOutputImage::RegionType& outputRegionForThread, int threadId)
   ::GenerateData()
   {
 

diff --git a/itk/clitkBackProjectImageFilter.h b/itk/clitkBackProjectImageFilter.h
index 0b905585e524f342c24925671f14e46b6d465323..7de71a116111326f2bed06060af31bc165a6ecb5 100644 (file)
--- a/itk/clitkBackProjectImageFilter.h
+++ b/itk/clitkBackProjectImageFilter.h
@@ -242,7 +242,7 @@ namespace clitk
     void BeforeThreadedGenerateData(void );
   
     // Threaded Generate Data
-    void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, itk::ThreadIdType threadId );
+    void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, int threadId );
 
  
     //------------------------------------------------

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

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

diff --git a/itk/clitkComposeVFFilter.txx b/itk/clitkComposeVFFilter.txx
index 5cc5db123bc505a9a77836b7160d00058d309e7c..7103a1025c40f95828e477823d8c2f2c0fc9554b 100644 (file)
--- a/itk/clitkComposeVFFilter.txx
+++ b/itk/clitkComposeVFFilter.txx
@@ -36,7 +36,7 @@ namespace clitk
   //=========================================================================================================================
   //update the output for the outputRegionForThread
   template<class InputImageType, class OutputImageType> 
-  void ComposeVFFilter<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId )
+  void ComposeVFFilter<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId )
   {
  
     //Get pointer to the output

diff --git a/itk/clitkDecomposeAndReconstructImageFilter.h b/itk/clitkDecomposeAndReconstructImageFilter.h
index bf97509a7bc43beb32b4e3f955df26ca50aba4c8..32d6bccb1bfecc7e48c24642e153ed52cd997454 100644 (file)
--- a/itk/clitkDecomposeAndReconstructImageFilter.h
+++ b/itk/clitkDecomposeAndReconstructImageFilter.h
@@ -131,7 +131,7 @@ namespace clitk
 
     //     // Threaded Generate Data
     //     void BeforeThreadedGenerateData(void );
-    //     void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId );
+    //     void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, int threadId );
     //     void AfterThreadedGenerateData(void );
     //     // Override defaults
     //     virtual void GenerateInputRequestedRegion();

diff --git a/itk/clitkDecomposeThroughErosionImageFilter.h b/itk/clitkDecomposeThroughErosionImageFilter.h
index aff2b12231cafa321ce581199e8fc431d9e48983..3ab61cbd141b02d815a58e1476caf48df8fef1bf 100644 (file)
--- a/itk/clitkDecomposeThroughErosionImageFilter.h
+++ b/itk/clitkDecomposeThroughErosionImageFilter.h
@@ -124,7 +124,7 @@ namespace clitk
 
     //     // Threaded Generate Data
     //     void BeforeThreadedGenerateData(void );
-    //     void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId );
+    //     void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, int threadId );
     //     void AfterThreadedGenerateData(void );
     //     // Override defaults
     //     virtual void GenerateInputRequestedRegion();

diff --git a/itk/clitkExtractImageFilter.h b/itk/clitkExtractImageFilter.h
index aae8332e04109089474228ae767522fe735d2376..7ea101adc2edbaba0f74e4f9becaa6be367b9b13 100644 (file)
--- a/itk/clitkExtractImageFilter.h
+++ b/itk/clitkExtractImageFilter.h
@@ -95,7 +95,7 @@ protected:
 
 
   void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
-                            itk::ThreadIdType threadId );
+                            int threadId );
   InputImageRegionType m_ExtractionRegion;
   OutputImageRegionType m_OutputImageRegion;
 

diff --git a/itk/clitkExtractImageFilter.txx b/itk/clitkExtractImageFilter.txx
index 36cd3fd66be8ea0de8464d637aebc3665f89e5c9..236a7cb0c1d3178eaa29eb999a264f79f99d3190 100644 (file)
--- a/itk/clitkExtractImageFilter.txx
+++ b/itk/clitkExtractImageFilter.txx
@@ -237,7 +237,7 @@ template <class TInputImage, class TOutputImage>
 void 
 ExtractImageFilter<TInputImage,TOutputImage>
 ::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
-                       itk::ThreadIdType threadId)
+                       int threadId)
 {
   itkDebugMacro(<<"Actually executing");
 

diff --git a/itk/clitkForwardWarpImageFilter.txx b/itk/clitkForwardWarpImageFilter.txx
index 283abe61c8c52fb3531e98d019a920a46734fe75..f5e98536516cb5e1657d577c50b1c8bff54d1687 100644 (file)
--- a/itk/clitkForwardWarpImageFilter.txx
+++ b/itk/clitkForwardWarpImageFilter.txx
@@ -84,7 +84,7 @@ protected:
 
   //the actual processing
   void BeforeThreadedGenerateData();
-  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId );
+  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
 
   //member data
   typename  itk::Image< double, ImageDimension>::Pointer m_Weights;
@@ -124,7 +124,7 @@ void HelperClass1<InputImageType, OutputImageType, DeformationFieldType>::Before
 //=========================================================================================================================
 //update the output for the outputRegionForThread
 template<class InputImageType, class OutputImageType, class DeformationFieldType >
-void HelperClass1<InputImageType, OutputImageType, DeformationFieldType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId )
+void HelperClass1<InputImageType, OutputImageType, DeformationFieldType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId )
 {
 
   //Get pointer to the input
@@ -303,7 +303,7 @@ protected:
 
 
   //the actual processing
-  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId );
+  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
 
 
   //member data
@@ -330,7 +330,7 @@ HelperClass2<InputImageType, OutputImageType>::HelperClass2()
 //=========================================================================================================================
 //update the output for the outputRegionForThread
 template<class InputImageType, class OutputImageType > void
-HelperClass2<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId )
+HelperClass2<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId )
 {
 
   //Get pointer to the input

diff --git a/itk/clitkInvertVFFilter.txx b/itk/clitkInvertVFFilter.txx
index 600775c04a1ef6c28f9442e0e1122b79e348f78e..0c443ca8e4812764371fda4520cb3f0cbe73b021 100644 (file)
--- a/itk/clitkInvertVFFilter.txx
+++ b/itk/clitkInvertVFFilter.txx
@@ -74,7 +74,7 @@ protected:
 
   //the actual processing
   void BeforeThreadedGenerateData();
-  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId );
+  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
 
   //member data
   typename  WeightsImageType::Pointer m_Weights;
@@ -111,7 +111,7 @@ void HelperClass1<InputImageType, OutputImageType>::BeforeThreadedGenerateData()
 //=========================================================================================================================
 //update the output for the outputRegionForThread
 template<class InputImageType, class OutputImageType>
-void HelperClass1<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId )
+void HelperClass1<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId )
 {
 
   //Get pointer to the input
@@ -282,7 +282,7 @@ protected:
 
 
   //the actual processing
-  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId );
+  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
 
 
   //member data
@@ -308,7 +308,7 @@ template<class InputImageType, class OutputImageType > HelperClass2<InputImageTy
 
 //=========================================================================================================================
 //update the output for the outputRegionForThread
-template<class InputImageType, class OutputImageType > void HelperClass2<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId )
+template<class InputImageType, class OutputImageType > void HelperClass2<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId )
 {
 
   //Get pointer to the input

diff --git a/itk/clitkReconstructThroughDilationImageFilter.h b/itk/clitkReconstructThroughDilationImageFilter.h
index de4d5abd636025ac777485e1748deacdb5755d3a..32d31fe51075bf235a8256d9d8066f38d7bf509a 100644 (file)
--- a/itk/clitkReconstructThroughDilationImageFilter.h
+++ b/itk/clitkReconstructThroughDilationImageFilter.h
@@ -115,7 +115,7 @@ namespace clitk
 
     //     // Threaded Generate Data
     //     void BeforeThreadedGenerateData(void );
-    //     void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId );
+    //     void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, int threadId );
     //     void AfterThreadedGenerateData(void );
     //     // Override defaults
     //     virtual void GenerateInputRequestedRegion();

diff --git a/itk/itkLabelOverlapMeasuresImageFilter.txx b/itk/itkLabelOverlapMeasuresImageFilter.txx
index dd047ba48f6ba65eccaeaabc2acacd05e0a1fe74..ced277b9b815265c8a25d628e16886305a14014b 100644 (file)
--- a/itk/itkLabelOverlapMeasuresImageFilter.txx
+++ b/itk/itkLabelOverlapMeasuresImageFilter.txx
@@ -145,7 +145,7 @@ template<class TLabelImage>
 void
 LabelOverlapMeasuresImageFilter<TLabelImage>
 ::ThreadedGenerateData( const RegionType& outputRegionForThread,
-  ThreadIdType threadId )
+  int threadId )
 {
   ImageRegionConstIterator<LabelImageType> ItS( this->GetSourceImage(),
     outputRegionForThread );

diff --git a/registration/clitkDifferenceImageFilter.h b/registration/clitkDifferenceImageFilter.h
index b958c69cb31316445a99b0e2f3b239496d6485d5..5199d9ee4a2ce07b6a32b5c0112c0449c6faf3de 100644 (file)
--- a/registration/clitkDifferenceImageFilter.h
+++ b/registration/clitkDifferenceImageFilter.h
@@ -17,7 +17,6 @@
 ===========================================================================**/
 #ifndef __clitkDifferenceImageFilter_h
 #define __clitkDifferenceImageFilter_h
-#include "clitkCommon.h"
 #include "clitkImageCommon.h"
 
 //itk include
@@ -57,7 +56,7 @@ namespace clitk
   protected:
     DifferenceImageFilter();
     ~DifferenceImageFilter() {};
-    void ThreadedGenerateData(const OutputImageRegionType& threadRegion, itk::ThreadIdType threadId);
+    void ThreadedGenerateData(const OutputImageRegionType& threadRegion, int threadId);
     
        
   };

diff --git a/registration/clitkDifferenceImageFilter.txx b/registration/clitkDifferenceImageFilter.txx
index 4ea8213e66c29934acdfda99dff422c362dc15ee..6aa822edd4b46d0658afffe7615d9d8f27e4bbea 100644 (file)
--- a/registration/clitkDifferenceImageFilter.txx
+++ b/registration/clitkDifferenceImageFilter.txx
@@ -53,7 +53,7 @@ namespace clitk
   //=========================================================================================================================
   //Update
   template <class InputImageType, class OutputImageType> 
-  void DifferenceImageFilter<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType &threadRegion, itk::ThreadIdType threadId)
+  void DifferenceImageFilter<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType &threadRegion, int threadId)
   {
     //Pointers to input and output
     typename InputImageType::ConstPointer input1=this->GetInput(0);

diff --git a/registration/clitkExtractImageFilter.h b/registration/clitkExtractImageFilter.h
index f3eac186edef23f5cf85cdd0440a1e1faacf5d2d..1e797bcd63f76f868db0afbb04b39afb9469f1f7 100644 (file)
--- a/registration/clitkExtractImageFilter.h
+++ b/registration/clitkExtractImageFilter.h
@@ -93,7 +93,7 @@ protected:
 
 
   void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
-                            itk::ThreadIdType threadId );
+                            int threadId );
   InputImageRegionType m_ExtractionRegion;
   OutputImageRegionType m_OutputImageRegion;
 

diff --git a/registration/clitkExtractImageFilter.txx b/registration/clitkExtractImageFilter.txx
index 7ce13a11054062cf4bccb487593c752a8ff3971e..d321f9ef413d2b03dd2330db7e246f01274d02cd 100644 (file)
--- a/registration/clitkExtractImageFilter.txx
+++ b/registration/clitkExtractImageFilter.txx
@@ -236,7 +236,7 @@ template <class TInputImage, class TOutputImage>
 void 
 ExtractImageFilter<TInputImage,TOutputImage>
 ::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
-                       itk::ThreadIdType threadId)
+                       int threadId)
 {
   itkDebugMacro(<<"Actually executing");
 

diff --git a/registration/clitkLinearCombinationImageFilter.h b/registration/clitkLinearCombinationImageFilter.h
index 196ab02f7fb3e12e8cd79ca4eca4072cfc367a31..879f0ad45eb30fcd797ff319a11d71ffeff89f6c 100644 (file)
--- a/registration/clitkLinearCombinationImageFilter.h
+++ b/registration/clitkLinearCombinationImageFilter.h
@@ -73,7 +73,7 @@ namespace clitk
     LinearCombinationImageFilter();
     virtual ~LinearCombinationImageFilter(){};
 
-    virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId);
+    virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
     
   private:
     LinearCombinationImageFilter(const Self&); //purposely not implemented

diff --git a/registration/clitkLinearCombinationImageFilter.txx b/registration/clitkLinearCombinationImageFilter.txx
index eeb61ff46ddb599a47af5f883a22bce113479f34..fad326cf9dd624bc94eac0c82c882a0288ac39a2 100644 (file)
--- a/registration/clitkLinearCombinationImageFilter.txx
+++ b/registration/clitkLinearCombinationImageFilter.txx
@@ -71,7 +71,7 @@ namespace clitk
   template <class InputImageType, class OutputImageType> 
   void 
   LinearCombinationImageFilter<InputImageType, OutputImageType>
-  ::ThreadedGenerateData(const OutputImageRegionType &threadRegion, itk::ThreadIdType threadId)
+  ::ThreadedGenerateData(const OutputImageRegionType &threadRegion, int threadId)
   {
     //Pointers to input and output
     typename InputImageType::ConstPointer input1=this->GetInput(0);

diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetric.h b/registration/clitkOptNormalizedCorrelationImageToImageMetric.h
index 150899409faf56b97c5673b08697a6ade386d9f5..83448afee1ea403bda7ba1dbe83553f5272d89c5 100644 (file)
--- a/registration/clitkOptNormalizedCorrelationImageToImageMetric.h
+++ b/registration/clitkOptNormalizedCorrelationImageToImageMetric.h
@@ -130,13 +130,13 @@ private:
   MeasureType ComputeSums( const ParametersType & parameters ) const;
 
 
-  inline bool GetValueThreadProcessSample( itk::ThreadIdType threadID,
+  inline bool GetValueThreadProcessSample( unsigned int threadID,
       unsigned long fixedImageSample,
       const MovingImagePointType & mappedPoint,
       double movingImageValue ) const;
 
 
-  inline bool GetValueAndDerivativeThreadProcessSample( itk::ThreadIdType threadID,
+  inline bool GetValueAndDerivativeThreadProcessSample( unsigned int threadID,
       unsigned long fixedImageSample,
       const MovingImagePointType & mappedPoint,
       double movingImageValue,

diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx b/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx
index 5d00ffba8bc106c7fd4c0ae88644594182adfbd1..3c0dfab48791b392a2b64087e6ee568eb44e3641 100644 (file)
--- a/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx
+++ b/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx
@@ -159,7 +159,7 @@ NormalizedCorrelationImageToImageMetric<TFixedImage,TMovingImage>
     delete [] m_ThreaderDerivativeF;
   }
   m_ThreaderDerivativeF = new DerivativeType[this->m_NumberOfThreads];
-  for(itk::ThreadIdType threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
+  for(unsigned int threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
     m_ThreaderDerivativeF[threadID].SetSize( this->m_NumberOfParameters );
   }
 
@@ -167,7 +167,7 @@ NormalizedCorrelationImageToImageMetric<TFixedImage,TMovingImage>
     delete [] m_ThreaderDerivativeM;
   }
   m_ThreaderDerivativeM = new DerivativeType[this->m_NumberOfThreads];
-  for(itk::ThreadIdType threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
+  for(unsigned int threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
     m_ThreaderDerivativeM[threadID].SetSize( this->m_NumberOfParameters );
   }
 }
@@ -177,7 +177,7 @@ template < class TFixedImage, class TMovingImage  >
 inline bool
 NormalizedCorrelationImageToImageMetric<TFixedImage,TMovingImage>
 ::GetValueThreadProcessSample(
-  itk::ThreadIdType threadID,
+  unsigned int threadID,
   unsigned long fixedImageSample,
   const MovingImagePointType & itkNotUsed(mappedPoint),
   double movingImageValue) const
@@ -358,7 +358,7 @@ template < class TFixedImage, class TMovingImage  >
 inline bool
 NormalizedCorrelationImageToImageMetric<TFixedImage,TMovingImage>
 ::GetValueAndDerivativeThreadProcessSample(
-  itk::ThreadIdType threadID,
+  unsigned int threadID,
   unsigned long fixedImageSample,
   const MovingImagePointType & itkNotUsed(mappedPoint),
   double movingImageValue,
@@ -446,7 +446,7 @@ NormalizedCorrelationImageToImageMetric<TFixedImage,TMovingImage>
           0,
           this->m_NumberOfParameters * sizeof(typename DerivativeType::ValueType) );
 
-  for( itk::ThreadIdType threadID = 0; threadID<this->m_NumberOfThreads; threadID++ ) {
+  for( unsigned int threadID = 0; threadID<this->m_NumberOfThreads; threadID++ ) {
     memset( m_ThreaderDerivativeF[threadID].data_block(),
             0,
             this->m_NumberOfParameters * sizeof(typename DerivativeType::ValueType) );

diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h
index 93a2ba919b005fbea9b9ce9e1691ab5ddbc9ac94..65559c2fcbb9d94b705ed7eb5c87c1bc234875df 100644 (file)
--- a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h
+++ b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h
@@ -130,13 +130,13 @@ private:
   MeasureType ComputeSums( const ParametersType & parameters ) const;
 
 
-  inline bool GetValueThreadProcessSample( ThreadIdType threadID,
+  inline bool GetValueThreadProcessSample( unsigned int threadID,
       unsigned long fixedImageSample,
       const MovingImagePointType & mappedPoint,
       double movingImageValue ) const;
 
 
-  inline bool GetValueAndDerivativeThreadProcessSample( ThreadIdType threadID,
+  inline bool GetValueAndDerivativeThreadProcessSample( unsigned int threadID,
       unsigned long fixedImageSample,
       const MovingImagePointType & mappedPoint,
       double movingImageValue,

diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx
index 769171b87dea70e25b491816e98a4634bb212533..d7c777742981f51e1b2234cf3004bcc49ecfbffe 100644 (file)
--- a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx
+++ b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx
@@ -159,7 +159,7 @@ NormalizedCorrelationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
     delete [] m_ThreaderDerivativeF;
   }
   m_ThreaderDerivativeF = new DerivativeType[this->m_NumberOfThreads];
-  for(ThreadIdType threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
+  for(unsigned int threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
     m_ThreaderDerivativeF[threadID].SetSize( this->m_NumberOfParameters );
   }
 
@@ -167,7 +167,7 @@ NormalizedCorrelationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
     delete [] m_ThreaderDerivativeM;
   }
   m_ThreaderDerivativeM = new DerivativeType[this->m_NumberOfThreads];
-  for(ThreadIdType threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
+  for(unsigned int threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
     m_ThreaderDerivativeM[threadID].SetSize( this->m_NumberOfParameters );
   }
 }
@@ -177,7 +177,7 @@ template < class TFixedImage, class TMovingImage  >
 inline bool
 NormalizedCorrelationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 ::GetValueThreadProcessSample(
-  ThreadIdType threadID,
+  unsigned int threadID,
   unsigned long fixedImageSample,
   const MovingImagePointType & itkNotUsed(mappedPoint),
   double movingImageValue) const
@@ -358,7 +358,7 @@ template < class TFixedImage, class TMovingImage  >
 inline bool
 NormalizedCorrelationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 ::GetValueAndDerivativeThreadProcessSample(
-  ThreadIdType threadID,
+  unsigned int threadID,
   unsigned long fixedImageSample,
   const MovingImagePointType & itkNotUsed(mappedPoint),
   double movingImageValue,
@@ -470,7 +470,7 @@ NormalizedCorrelationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
           0,
           this->m_NumberOfParameters * sizeof(typename DerivativeType::ValueType) );
 
-  for( ThreadIdType threadID = 0; threadID<this->m_NumberOfThreads; threadID++ ) {
+  for( unsigned int threadID = 0; threadID<this->m_NumberOfThreads; threadID++ ) {
     memset( m_ThreaderDerivativeF[threadID].data_block(),
             0,
             this->m_NumberOfParameters * sizeof(typename DerivativeType::ValueType) );

diff --git a/registration/clitkResampleBSplineDeformableTransformImageFilter.h b/registration/clitkResampleBSplineDeformableTransformImageFilter.h
index 3d4fbedbc9852a6abadd70a9aefda1bce0d0c6e8..a5788a9f4bba1af6fafc4f6ad6077ee043b86571 100644 (file)
--- a/registration/clitkResampleBSplineDeformableTransformImageFilter.h
+++ b/registration/clitkResampleBSplineDeformableTransformImageFilter.h
@@ -133,7 +133,7 @@ namespace clitk
     void GenerateData(void);
     //     // Threaded Generate Data
     //     void BeforeThreadedGenerateData(void );
-    //     void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId );
+    //     void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, int threadId );
     //     void AfterThreadedGenerateData(void );
     //     // Override defaults
     //     virtual void GenerateInputRequestedRegion();

diff --git a/registration/clitkTransformToDeformationFieldSource.h b/registration/clitkTransformToDeformationFieldSource.h
index 27008216cb18439aeb4060c88451009fa14b7645..69a6df7ea6c63864261e9d969bc1af6c712cd7f8 100644 (file)
--- a/registration/clitkTransformToDeformationFieldSource.h
+++ b/registration/clitkTransformToDeformationFieldSource.h
@@ -184,21 +184,21 @@ protected:
    */
   void ThreadedGenerateData(
     const OutputImageRegionType & outputRegionForThread,
-    itk::ThreadIdType threadId );
+    int threadId );
 
   /** Default implementation for resampling that works for any
    * transformation type.
    */
   void NonlinearThreadedGenerateData(
     const OutputImageRegionType& outputRegionForThread,
-    itk::ThreadIdType threadId );
+    int threadId );
 
   /** Faster implementation for resampling that works for with linear
    *  transformation types. 
    */
   void LinearThreadedGenerateData(
     const OutputImageRegionType & outputRegionForThread,
-    itk::ThreadIdType threadId );
+    int threadId );
   
 private:
 

diff --git a/registration/clitkTransformToDeformationFieldSource.txx b/registration/clitkTransformToDeformationFieldSource.txx
index adac4f6f0e41e8103f73a14abc70c3f73da43b6d..d45f49d33f1fa32f6528b88e57b7fe6d3d2b32f7 100644 (file)
--- a/registration/clitkTransformToDeformationFieldSource.txx
+++ b/registration/clitkTransformToDeformationFieldSource.txx
@@ -182,7 +182,7 @@ void
 TransformToDeformationFieldSource<TOutputImage, TTransformPrecisionType>
   ::ThreadedGenerateData(
   const OutputImageRegionType & outputRegionForThread,
-  itk::ThreadIdType threadId )
+  int threadId )
 {
   // Check whether we can use a fast path for resampling. Fast path
   // can be used if the transformation is linear. Transform respond
@@ -203,7 +203,7 @@ void
 TransformToDeformationFieldSource<TOutputImage, TTransformPrecisionType>
   ::NonlinearThreadedGenerateData(
   const OutputImageRegionType & outputRegionForThread,
-  itk::ThreadIdType threadId )
+  int threadId )
 {
   // Get the output pointer
   OutputImagePointer outputPtr = this->GetOutput();
@@ -253,7 +253,7 @@ void
 TransformToDeformationFieldSource<TOutputImage, TTransformPrecisionType>
   ::LinearThreadedGenerateData(
   const OutputImageRegionType & outputRegionForThread,
-  itk::ThreadIdType threadId )
+  int threadId )
 {
   // Get the output pointer
   OutputImagePointer outputPtr = this->GetOutput();

diff --git a/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h b/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
index 54eedb8deb23ec5cb59d4f40e542906c4f2b651d..7cfe51e203aa30af2ef6c6c65c8bc2a3e03369e6 100644 (file)
--- a/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
+++ b/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
@@ -313,7 +313,7 @@ private:
     FixedImageSampleContainer & samples );
 
   /** Compute PDF derivative contribution for each parameter. */
-  virtual void ComputePDFDerivatives( ThreadIdType threadID,
+  virtual void ComputePDFDerivatives( unsigned int threadID,
                                       unsigned int sampleNumber,
                                       int movingImageParzenWindowIndex,
                                       const ImageDerivativesType
@@ -333,26 +333,26 @@ private:
   mutable bool                                  m_ImplicitDerivativesSecondPass;
 
 
-  virtual inline void GetValueThreadPreProcess( ThreadIdType threadID,
+  virtual inline void GetValueThreadPreProcess( unsigned int threadID,
       bool withinSampleThread ) const;
-  virtual inline bool GetValueThreadProcessSample( ThreadIdType threadID,
+  virtual inline bool GetValueThreadProcessSample( unsigned int threadID,
       unsigned long fixedImageSample,
       const MovingImagePointType & mappedPoint,
       double movingImageValue ) const;
-  virtual inline void GetValueThreadPostProcess( ThreadIdType threadID,
+  virtual inline void GetValueThreadPostProcess( unsigned int threadID,
       bool withinSampleThread ) const;
 
   virtual inline void GetValueAndDerivativeThreadPreProcess(
-    ThreadIdType threadID,
+    unsigned int threadID,
     bool withinSampleThread ) const;
-  virtual inline bool GetValueAndDerivativeThreadProcessSample( ThreadIdType threadID,
+  virtual inline bool GetValueAndDerivativeThreadProcessSample( unsigned int threadID,
       unsigned long fixedImageSample,
       const MovingImagePointType & mappedPoint,
       double movingImageValue,
       const ImageDerivativesType &
       movingImageGradientValue ) const;
   virtual inline void GetValueAndDerivativeThreadPostProcess(
-    ThreadIdType threadID,
+    unsigned int threadID,
     bool withinSampleThread ) const;
 
 };

diff --git a/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx b/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
index b09abd3319349634e06b0b392e94520a85c0cbc9..f55b19a5556d1d76c343babb15e80f610b6ec117 100644 (file)
--- a/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
+++ b/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
@@ -386,7 +386,7 @@ MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
   }
   m_ThreaderJointPDFSum = new double[this->m_NumberOfThreads];
 
-  ThreadIdType threadID;
+  unsigned int threadID;
 
   int binRange = m_NumberOfHistogramBins / this->m_NumberOfThreads;
 
@@ -473,7 +473,7 @@ MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 template < class TFixedImage, class TMovingImage  >
 inline void
 MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::GetValueThreadPreProcess( ThreadIdType threadID,
+::GetValueThreadPreProcess( unsigned int threadID,
                             bool withinSampleThread ) const
 {
 
@@ -501,7 +501,7 @@ MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 template < class TFixedImage, class TMovingImage  >
 inline bool
 MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::GetValueThreadProcessSample( ThreadIdType threadID,
+::GetValueThreadProcessSample( unsigned int threadID,
                                unsigned long fixedImageSample,
                                const MovingImagePointType & itkNotUsed(mappedPoint),
                                double movingImageValue) const
@@ -576,7 +576,7 @@ MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 template < class TFixedImage, class TMovingImage  >
 inline void
 MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::GetValueThreadPostProcess( ThreadIdType threadID,
+::GetValueThreadPostProcess( unsigned int threadID,
                              bool itkNotUsed(withinSampleThread) ) const
 {
   unsigned int t;
@@ -640,7 +640,7 @@ MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
   // MUST BE CALLED TO INITIATE PROCESSING
   this->GetValueMultiThreadedPostProcessInitiate();
 
-  for(ThreadIdType threadID = 0; threadID<this->m_NumberOfThreads-1; threadID++) {
+  for(unsigned int threadID = 0; threadID<this->m_NumberOfThreads-1; threadID++) {
     m_JointPDFSum += m_ThreaderJointPDFSum[threadID];
   }
   if ( m_JointPDFSum == 0.0 ) {
@@ -722,7 +722,7 @@ MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 template < class TFixedImage, class TMovingImage  >
 inline void
 MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::GetValueAndDerivativeThreadPreProcess( ThreadIdType threadID,
+::GetValueAndDerivativeThreadPreProcess( unsigned int threadID,
     bool itkNotUsed(withinSampleThread) ) const
 {
   if(threadID > 0) {
@@ -759,7 +759,7 @@ MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 template < class TFixedImage, class TMovingImage  >
 inline bool
 MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::GetValueAndDerivativeThreadProcessSample( ThreadIdType threadID,
+::GetValueAndDerivativeThreadProcessSample( unsigned int threadID,
     unsigned long fixedImageSample,
     const MovingImagePointType & itkNotUsed(mappedPoint),
     double movingImageValue,
@@ -866,7 +866,7 @@ MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 template < class TFixedImage, class TMovingImage  >
 inline void
 MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::GetValueAndDerivativeThreadPostProcess( ThreadIdType threadID,
+::GetValueAndDerivativeThreadPostProcess( unsigned int threadID,
     bool withinSampleThread ) const
 {
   this->GetValueThreadPostProcess( threadID, withinSampleThread );
@@ -933,7 +933,7 @@ MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
   } else {
     this->m_PRatioArray.Fill( 0.0 );
     this->m_MetricDerivative.Fill( NumericTraits< MeasureType >::Zero );
-    for(ThreadIdType threadID = 0; threadID < this->m_NumberOfThreads-1; threadID++ ) {
+    for(unsigned int threadID = 0; threadID < this->m_NumberOfThreads-1; threadID++ ) {
       this->m_ThreaderMetricDerivative[threadID].Fill( NumericTraits< MeasureType >::Zero );
     }
     this->m_ImplicitDerivativesSecondPass = false;
@@ -951,7 +951,7 @@ MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
   // CALL IF DOING THREADED POST PROCESSING
   this->GetValueAndDerivativeMultiThreadedPostProcessInitiate();
 
-  for(ThreadIdType threadID = 0; threadID<this->m_NumberOfThreads-1; threadID++) {
+  for(unsigned int threadID = 0; threadID<this->m_NumberOfThreads-1; threadID++) {
     m_JointPDFSum += m_ThreaderJointPDFSum[threadID];
   }
   if ( m_JointPDFSum == 0.0 ) {
@@ -1095,7 +1095,7 @@ MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 template < class TFixedImage, class TMovingImage >
 void
 MattesMutualInformationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::ComputePDFDerivatives( ThreadIdType threadID,
+::ComputePDFDerivatives( unsigned int threadID,
                          unsigned int sampleNumber,
                          int pdfMovingIndex,
                          const ImageDerivativesType & movingImageGradientValue,

diff --git a/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h b/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h
index 2eb0bc79aa4030d16ff5fe2f3218cf16d8f71d27..acb0b1b3aa4065be0e402fda51a3ecc0dabea788 100644 (file)
--- a/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h
+++ b/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h
@@ -129,12 +129,12 @@ private:
   //purposely not implemented
   void operator=(const Self &);
 
-  inline bool GetValueThreadProcessSample( ThreadIdType threadID,
+  inline bool GetValueThreadProcessSample( unsigned int threadID,
       unsigned long fixedImageSample,
       const MovingImagePointType & mappedPoint,
       double movingImageValue ) const;
 
-  inline bool GetValueAndDerivativeThreadProcessSample( ThreadIdType threadID,
+  inline bool GetValueAndDerivativeThreadProcessSample( unsigned int threadID,
       unsigned long fixedImageSample,
       const MovingImagePointType & mappedPoint,
       double movingImageValue,

diff --git a/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.txx b/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.txx
index ec32c74f022147e3cb50f2d65f3a695ff8903a5e..cf173407bf7310fd4e4a921f4b278c2053f5e0a1 100644 (file)
--- a/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.txx
+++ b/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.txx
@@ -115,7 +115,7 @@ MeanSquaresImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
     delete [] m_ThreaderMSEDerivatives;
   }
   m_ThreaderMSEDerivatives = new DerivativeType[this->m_NumberOfThreads];
-  for(ThreadIdType threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
+  for(unsigned int threadID=0; threadID<this->m_NumberOfThreads; threadID++) {
     m_ThreaderMSEDerivatives[threadID].SetSize( this->m_NumberOfParameters );
   }
 }
@@ -123,7 +123,7 @@ MeanSquaresImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 template < class TFixedImage, class TMovingImage  >
 inline bool
 MeanSquaresImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::GetValueThreadProcessSample( ThreadIdType threadID,
+::GetValueThreadProcessSample( unsigned int threadID,
                                unsigned long fixedImageSample,
                                const MovingImagePointType & itkNotUsed(mappedPoint),
                                double movingImageValue) const
@@ -186,7 +186,7 @@ MeanSquaresImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 template < class TFixedImage, class TMovingImage  >
 inline bool
 MeanSquaresImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
-::GetValueAndDerivativeThreadProcessSample( ThreadIdType threadID,
+::GetValueAndDerivativeThreadProcessSample( unsigned int threadID,
     unsigned long fixedImageSample,
     const MovingImagePointType & itkNotUsed(mappedPoint),
     double movingImageValue,
@@ -274,7 +274,7 @@ MeanSquaresImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
           0,
           this->m_NumberOfParameters * sizeof(double) );
 
-  for( ThreadIdType threadID = 0; threadID<this->m_NumberOfThreads; threadID++ ) {
+  for( unsigned int threadID = 0; threadID<this->m_NumberOfThreads; threadID++ ) {
     memset( m_ThreaderMSEDerivatives[threadID].data_block(),
             0,
             this->m_NumberOfParameters * sizeof(double) );

diff --git a/tools/clitkCombineImageFilter.h b/tools/clitkCombineImageFilter.h
index c48b1d188fbf0aaf20ec15b796f9d70f7bc203b2..024b5c6ae2ce8e61817c1741b96774f797bc8bc5 100644 (file)
--- a/tools/clitkCombineImageFilter.h
+++ b/tools/clitkCombineImageFilter.h
@@ -90,7 +90,7 @@ namespace clitk
     // Update
     //----------------------------------------  
     // Generate Data
-    void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, itk::ThreadIdType threadId);
+    void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, int threadId);
 
     //----------------------------------------  
     // Data members

diff --git a/tools/clitkCombineImageFilter.txx b/tools/clitkCombineImageFilter.txx
index 206adac7ad7a7cb65befa6f6866b4076b540f9d6..8a4f0514e39a9ac82b8ddcaa5de6d12f9ce72add 100644 (file)
--- a/tools/clitkCombineImageFilter.txx
+++ b/tools/clitkCombineImageFilter.txx
@@ -46,7 +46,7 @@ namespace clitk
   //-------------------------------------------------------------------
   template<class InputImageType> 
   void 
-  CombineImageFilter<InputImageType>::ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, itk::ThreadIdType threadId)
+  CombineImageFilter<InputImageType>::ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, int threadId)
   {
     typename InputImageType::ConstPointer input1=this->GetInput(0);
     typename InputImageType::ConstPointer input2=this->GetInput(1);

diff --git a/tools/clitkComposeVFGenericFilter.h b/tools/clitkComposeVFGenericFilter.h
index dcb913e0841bb775d62cedf53fd099ebe9c60cf8..c3e8bd38fb237ac709fe8c1efd25750a08909d27 100644 (file)
--- a/tools/clitkComposeVFGenericFilter.h
+++ b/tools/clitkComposeVFGenericFilter.h
@@ -21,7 +21,6 @@
 
 // clitk
 #include "clitkIO.h"
-#include "clitkCommon.h"
 #include "clitkImageCommon.h"
 #include "clitkComposeVFFilter.h"
 

diff --git a/tools/clitkVectorImageToImageFilter.h b/tools/clitkVectorImageToImageFilter.h
index f2288f0381de2295dc6d4dc6c67fe00afeb010b6..cf5946e3849e4adac4fd5ed3d74a3c02422f33d5 100644 (file)
--- a/tools/clitkVectorImageToImageFilter.h
+++ b/tools/clitkVectorImageToImageFilter.h
@@ -86,7 +86,7 @@ namespace clitk
     //----------------------------------------  
     // Update
     //----------------------------------------  
-    void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, itk::ThreadIdType threadId );
+    void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, int threadId );
    
     //----------------------------------------  
     // Data members

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