X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h;h=6718316ea9543122261457cb08524136069af3d7;hb=e751b47051ae80ecd388418ae39b388f15e627eb;hp=65559c2fcbb9d94b705ed7eb5c87c1bc234875df;hpb=0793c4dd3d451bb9bdc00e3172fa792d1ddaa8dc;p=clitk.git diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h index 65559c2..6718316 100644 --- a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h +++ b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.h @@ -19,11 +19,7 @@ #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" @@ -99,25 +95,25 @@ public: * (2) uniformly select NumberOfSpatialSamples within * the FixedImageRegion, and * (3) allocate memory for pdf data structures. */ - virtual void Initialize(void) throw ( itk::ExceptionObject ); + virtual void Initialize(void) ITK_OVERRIDE; /** 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 +129,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 +137,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;