X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h;h=3afd1b6b13dae196a32e53066d2773eb27b603ef;hb=378ee630dce37a3e15baf3a8027542c2f8cf43de;hp=65559c2fcbb9d94b705ed7eb5c87c1bc234875df;hpb=4d95e8a4680c1f0e635da4a36b336d316f16b8ba;p=clitk.git

diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h
index 65559c2..3afd1b6 100644
--- a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h
+++ b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h
@@ -19,17 +19,11 @@
 #ifndef __clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD_h
 #define __clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD_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"
 
-#include "itkMultiThreader.h"
-
 namespace clitk
 {
 
@@ -99,25 +93,29 @@ public:
    *  (2) uniformly select NumberOfSpatialSamples within
    *      the FixedImageRegion, and
    *  (3) allocate memory for pdf data structures. */
-  virtual void Initialize(void) throw ( itk::ExceptionObject );
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
+  virtual void Initialize(void) ITK_OVERRIDE;
+#else
+  virtual void Initialize(void) throw ( itk::ExceptionObject ) ITK_OVERRIDE;
+#endif
 
   /**  Get the value. */
-  MeasureType GetValue( const ParametersType & parameters ) const;
+  MeasureType GetValue( const ParametersType & parameters ) const ITK_OVERRIDE;
 
   /** Get the derivatives of the match measure. */
   void GetDerivative( const ParametersType & parameters,
-                      DerivativeType & Derivative ) const;
+                      DerivativeType & Derivative ) const ITK_OVERRIDE;
 
   /**  Get the value and derivatives for single valued optimizers. */
   void GetValueAndDerivative( const ParametersType & parameters,
                               MeasureType & Value,
-                              DerivativeType & Derivative ) const;
+                              DerivativeType & Derivative ) const ITK_OVERRIDE;
 
 protected:
 
   NormalizedCorrelationImageToImageMetricFor3DBLUTFFD();
   virtual ~NormalizedCorrelationImageToImageMetricFor3DBLUTFFD();
-  void PrintSelf(std::ostream& os, itk::Indent indent) const;
+  void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
 
 private:
 
@@ -133,7 +131,7 @@ private:
   inline bool GetValueThreadProcessSample( unsigned int threadID,
       unsigned long fixedImageSample,
       const MovingImagePointType & mappedPoint,
-      double movingImageValue ) const;
+      double movingImageValue ) const ITK_OVERRIDE;
 
 
   inline bool GetValueAndDerivativeThreadProcessSample( unsigned int threadID,
@@ -141,7 +139,7 @@ private:
       const MovingImagePointType & mappedPoint,
       double movingImageValue,
       const ImageDerivativesType &
-      movingImageGradientValue ) const;
+      movingImageGradientValue ) const ITK_OVERRIDE;
 
   AccumulateType *m_ThreaderSFF, *m_ThreaderSMM, *m_ThreaderSFM, *m_ThreaderSF, *m_ThreaderSM;
   mutable AccumulateType m_SFF, m_SMM, m_SFM, m_SF, m_SM;