X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkOptNormalizedCorrelationImageToImageMetric.h;h=242a4a1934b48ad6089e1927a2fffb77f3f273d0;hb=4b107ba6fbea5265930cdd750f03a0ea6a47aba5;hp=150899409faf56b97c5673b08697a6ade386d9f5;hpb=a6957c4825e83c61b977ec316dd841878617ffbd;p=clitk.git

diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetric.h b/registration/clitkOptNormalizedCorrelationImageToImageMetric.h
index 1508994..242a4a1 100644
--- a/registration/clitkOptNormalizedCorrelationImageToImageMetric.h
+++ b/registration/clitkOptNormalizedCorrelationImageToImageMetric.h
@@ -19,11 +19,7 @@
 #ifndef __clitkOptNormalizedCorrelationImageToImageMetric_h
 #define __clitkOptNormalizedCorrelationImageToImageMetric_h
 
-#if ITK_VERSION_MAJOR >= 4
-  #include "itkImageToImageMetric.h"
-#else
-  #include "itkOptImageToImageMetric.h"
-#endif
+#include "itkImageToImageMetric.h"
 #include "itkCovariantVector.h"
 #include "itkPoint.h"
 #include "itkIndex.h"
@@ -130,13 +126,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,