X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=registration%2FclitkMultipleBSplineDeformableTransform.h;h=1b7909ab6f35146deac97d95cc1ed689bf45d81b;hb=bfd2c4f867ddeaa1fdb556c44e58aabe467e64b5;hp=84e8f7494b4918dfcf465f961c830bf82c56a9fc;hpb=d60b4a0e4974263d4a0b761f691e9388a8de1879;p=clitk.git diff --git a/registration/clitkMultipleBSplineDeformableTransform.h b/registration/clitkMultipleBSplineDeformableTransform.h index 84e8f74..1b7909a 100644 --- a/registration/clitkMultipleBSplineDeformableTransform.h +++ b/registration/clitkMultipleBSplineDeformableTransform.h @@ -59,6 +59,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; @@ -224,7 +227,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; @@ -282,7 +289,7 @@ namespace clitk } // namespace clitk -#if ITK_TEMPLATE_TXX +#ifndef ITK_MANUAL_INSTANTIATION # include "clitkMultipleBSplineDeformableTransform.txx" #endif