X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkBSplineDeformableTransform.h;h=8f5a278c6ad0930115070ddc4ae6463a2a5ffa4d;hb=20147f097d36f54eae548368df24f577e5567677;hp=4ea8b58a3e790f0e3e9ecb094e7f338090bfc551;hpb=3a2e2acdcf35146a7016a9be56ff366208e0d4be;p=clitk.git

diff --git a/registration/clitkBSplineDeformableTransform.h b/registration/clitkBSplineDeformableTransform.h
index 4ea8b58..8f5a278 100644
--- a/registration/clitkBSplineDeformableTransform.h
+++ b/registration/clitkBSplineDeformableTransform.h
@@ -3,7 +3,7 @@
 
   Authors belong to: 
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef __clitkBSplineDeformableTransform_h
 #define __clitkBSplineDeformableTransform_h
 #include "clitkVectorBSplineResampleImageFunctionWithLUT.h"
@@ -65,6 +65,7 @@ namespace clitk
 
     /** Standard parameters container. */
     typedef typename Superclass::ParametersType ParametersType;
+    typedef typename Superclass::NumberOfParametersType NumberOfParametersType;
 
     /** Standard Jacobian container. */
     typedef typename Superclass::JacobianType JacobianType;
@@ -254,10 +255,14 @@ namespace clitk
     } 
     
     /** Compute the Jacobian Matrix of the transformation at one point */
-    virtual const JacobianType& GetJacobian(const InputPointType  &point ) const;
+    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() );
+    }
 
     /** Return the number of parameters that completely define the Transfom */
-    virtual unsigned int GetNumberOfParameters(void) const;
+    virtual NumberOfParametersType GetNumberOfParameters(void) const;
 
     /** Return the number of parameters per dimension */
     unsigned int GetNumberOfParametersPerDimension(void) const;
@@ -363,13 +368,13 @@ namespace clitk
 
     // VD Add MultipleBSplineDeformableTransform as friend to facilitate wrapping
     friend class MultipleBSplineDeformableTransform<TCoordRep, NInputDimensions, NOutputDimensions>;
-
+    mutable JacobianType                            m_SharedDataBSplineJacobian;
   }; //class BSplineDeformableTransform
 
 
 }  // namespace itk
 
-#if ITK_TEMPLATE_TXX
+#ifndef ITK_MANUAL_INSTANTIATION
 # include "clitkBSplineDeformableTransform.txx"
 #endif