Merge branch 'master' of /home/dsarrut/clitk3.server

[clitk.git] / registration / clitkMultiResolutionPDEDeformableRegistration.txx

diff --git a/registration/clitkMultiResolutionPDEDeformableRegistration.txx b/registration/clitkMultiResolutionPDEDeformableRegistration.txx
index a10942c1db04dbc1c150d9d6ad66c4159c0b683f..5c6b0aeaf55c38e2e3361f2d683a15a4c7d1b927 100644 (file)
--- a/registration/clitkMultiResolutionPDEDeformableRegistration.txx
+++ b/registration/clitkMultiResolutionPDEDeformableRegistration.txx
@@ -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
 
       }