X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkShapedBLUTSpatioTemporalDeformableTransform.h;h=b1924580c503d9ff9f62f58cdc29cb004a66bfa7;hb=bfd2c4f867ddeaa1fdb556c44e58aabe467e64b5;hp=f3071b136c39433e2738063a646b268eadb5bc56;hpb=c4de479fec231c7d53555dcd21d308f06aad17ec;p=clitk.git diff --git a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h index f3071b1..b192458 100644 --- a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h +++ b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h @@ -68,6 +68,9 @@ namespace clitk /** Standard parameters container. */ typedef typename Superclass::ParametersType ParametersType; +#if ITK_VERSION_MAJOR >= 4 + typedef typename Superclass::NumberOfParametersType NumberOfParametersType; +#endif /** Standard Jacobian container. */ typedef typename Superclass::JacobianType JacobianType; @@ -274,7 +277,11 @@ namespace clitk #endif /** Return the number of parameters that completely define the Transfom */ +#if ITK_VERSION_MAJOR >= 4 + virtual NumberOfParametersType GetNumberOfParameters(void) const; +#else virtual unsigned int GetNumberOfParameters(void) const; +#endif //JV Return the padded number of parameters virtual unsigned int GetPaddedNumberOfParameters(void) const; @@ -447,7 +454,7 @@ namespace clitk } // namespace itk -#if ITK_TEMPLATE_TXX +#ifndef ITK_MANUAL_INSTANTIATION # include "clitkShapedBLUTSpatioTemporalDeformableTransform.txx" #endif