X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkMultipleBSplineDeformableTransform.h;h=ae9f16ff420def695c58a909f2903af05f4d56ac;hb=e751b47051ae80ecd388418ae39b388f15e627eb;hp=5b2ee9eb35686933603bb10b4f22796e1be100b7;hpb=e1098dccba022441144bfc1c44a2b58db7dde34e;p=clitk.git

diff --git a/registration/clitkMultipleBSplineDeformableTransform.h b/registration/clitkMultipleBSplineDeformableTransform.h
index 5b2ee9e..ae9f16f 100644
--- a/registration/clitkMultipleBSplineDeformableTransform.h
+++ b/registration/clitkMultipleBSplineDeformableTransform.h
@@ -59,9 +59,7 @@ 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;
@@ -216,22 +214,14 @@ namespace clitk
     }
 
     /** Compute the Jacobian Matrix of the transformation at one point */
-#if ITK_VERSION_MAJOR >= 4
     virtual void ComputeJacobianWithRespectToParameters (const InputPointType &p, JacobianType &jacobian) const;
     virtual void ComputeJacobianWithRespectToPosition (const InputPointType &p, JacobianType &jacobian) const
     {
       itkExceptionMacro( "ComputeJacobianWithRespectToPosition not yet implemented for " << this->GetNameOfClass() );
     }
-#else
-    virtual const JacobianType& GetJacobian(const InputPointType  &point ) const;
-#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;
@@ -278,9 +268,7 @@ namespace clitk
     std::vector<ParametersType>                     m_parameters;
     mutable std::vector<CoefficientImagePointer>    m_CoefficientImages;
     mutable int                                     m_LastJacobian;
-#if ITK_VERSION_MAJOR >= 4
     mutable JacobianType                            m_SharedDataBSplineJacobian;
-#endif
 
     void InitJacobian();
     // FIXME it seems not used
@@ -289,7 +277,7 @@ namespace clitk
 
 }  // namespace clitk
 
-#if ITK_TEMPLATE_TXX
+#ifndef ITK_MANUAL_INSTANTIATION
 # include "clitkMultipleBSplineDeformableTransform.txx"
 #endif