X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FitkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h;h=d23a9cd67134d14fba5a1a92313d1aeb943cf6b1;hb=ef03fc34db849c864b1ae7f50c8442e125834f84;hp=78bf91c994de12c6fabe0a9cb14cd5d085f58c19;hpb=c18059db4f507fd31b5898667f57eced7d48c5f7;p=clitk.git

diff --git a/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h b/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h
index 78bf91c..d23a9cd 100644
--- a/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h
+++ b/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h
@@ -3,7 +3,7 @@
 
   Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 
 /*=========================================================================
 
@@ -35,13 +35,11 @@
 #ifndef __itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD_h
 #define __itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD_h
 
-#include "itkOptImageToImageMetric.h"
+#include "itkImageToImageMetric.h"
 #include "itkCovariantVector.h"
 #include "itkPoint.h"
 #include "itkIndex.h"
 
-#include "itkMultiThreader.h"
-
 namespace itk
 {
 
@@ -98,25 +96,29 @@ public:
    *  (2) uniformly select NumberOfSpatialSamples within
    *      the FixedImageRegion, and
    *  (3) allocate memory for pdf data structures. */
-  virtual void Initialize(void) throw ( 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 ( 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:
 
   MeanSquaresImageToImageMetricFor3DBLUTFFD();
   virtual ~MeanSquaresImageToImageMetricFor3DBLUTFFD();
-  void PrintSelf(std::ostream& os, Indent indent) const;
+  void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE;
 
 private:
 
@@ -128,14 +130,14 @@ 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,
       unsigned long fixedImageSample,
       const MovingImagePointType & mappedPoint,
       double movingImageValue,
       const ImageDerivativesType &
-      movingImageGradientValue ) const;
+      movingImageGradientValue ) const ITK_OVERRIDE;
 
   MeasureType    * m_ThreaderMSE;
   DerivativeType * m_ThreaderMSEDerivatives;