X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=registration%2FclitkBSplineDeformableTransform.h;h=392247f25717e80e6dede00e6e8167414af11b4a;hb=bfd2c4f867ddeaa1fdb556c44e58aabe467e64b5;hp=bab7f8c78257206b4d060b557211235d89b2217d;hpb=fa358ee6738c92950cd9e6c45f55dda6e9b4576e;p=clitk.git diff --git a/registration/clitkBSplineDeformableTransform.h b/registration/clitkBSplineDeformableTransform.h index bab7f8c..392247f 100644 --- a/registration/clitkBSplineDeformableTransform.h +++ b/registration/clitkBSplineDeformableTransform.h @@ -65,6 +65,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; @@ -265,7 +268,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 /** Return the number of parameters per dimension */ unsigned int GetNumberOfParametersPerDimension(void) const; @@ -380,7 +387,7 @@ namespace clitk } // namespace itk -#if ITK_TEMPLATE_TXX +#ifndef ITK_MANUAL_INSTANTIATION # include "clitkBSplineDeformableTransform.txx" #endif