X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FitkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h;h=949246d4c581b2586eb51ee3862a7b04ec16691f;hb=2bc7c08783fb733944d25b4586bf9fcb9ccfd98b;hp=2eb0bc79aa4030d16ff5fe2f3218cf16d8f71d27;hpb=1561fae3bf0756ba34e222cd1f189aac0087c62a;p=clitk.git diff --git a/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h b/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h index 2eb0bc7..949246d 100644 --- a/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h +++ b/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.h @@ -35,11 +35,7 @@ #ifndef __itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD_h #define __itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD_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" @@ -129,12 +125,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,