X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkMultiResolutionPDEDeformableRegistration.txx;h=5c6b0aeaf55c38e2e3361f2d683a15a4c7d1b927;hb=bfd2c4f867ddeaa1fdb556c44e58aabe467e64b5;hp=933f169cf3e7fc19a070e7e07327d0e02c8d06d9;hpb=657652a78c2e2717a6f77e027049173442ca29f0;p=clitk.git

diff --git a/registration/clitkMultiResolutionPDEDeformableRegistration.txx b/registration/clitkMultiResolutionPDEDeformableRegistration.txx
old mode 100755
new mode 100644
index 933f169..5c6b0ae
--- a/registration/clitkMultiResolutionPDEDeformableRegistration.txx
+++ b/registration/clitkMultiResolutionPDEDeformableRegistration.txx
@@ -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 _clitkMultiResolutionPDEDeformableRegistration_txx
 #define _clitkMultiResolutionPDEDeformableRegistration_txx
 #include "clitkMultiResolutionPDEDeformableRegistration.h"
@@ -335,7 +335,11 @@ MultiResolutionPDEDeformableRegistration<TFixedImage,TMovingImage,TDeformationFi
       
       if( tempField.IsNull() )
 	{
+#if ITK_VERSION_MAJOR >= 4
+	  m_RegistrationFilter->SetInitialDisplacementField( NULL );
+#else
 	  m_RegistrationFilter->SetInitialDeformationField( NULL );
+#endif
 	}
       else
 	{
@@ -357,7 +361,11 @@ MultiResolutionPDEDeformableRegistration<TFixedImage,TMovingImage,TDeformationFi
       tempField = m_FieldExpander->GetOutput();
       tempField->DisconnectPipeline();
 
+#if ITK_VERSION_MAJOR >= 4
+      m_RegistrationFilter->SetInitialDisplacementField( tempField );
+#else
       m_RegistrationFilter->SetInitialDeformationField( tempField );
+#endif
 
       }