X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkConvertBLUTCoeffsToVFFilter.txx;h=491d049eaaed032e770184128d64feb55b61c227;hb=bec6f659babc742382ca007b53800e7305fa298f;hp=32464d7466d907ace9a3e399f1d671d7c3cbddc5;hpb=0c74b91a2df4c56e7130589f1ede54650211db92;p=clitk.git

diff --git a/registration/clitkConvertBLUTCoeffsToVFFilter.txx b/registration/clitkConvertBLUTCoeffsToVFFilter.txx
index 32464d7..491d049 100644
--- a/registration/clitkConvertBLUTCoeffsToVFFilter.txx
+++ b/registration/clitkConvertBLUTCoeffsToVFFilter.txx
@@ -1,11 +1,11 @@
 
 #include "clitkConvertBLUTCoeffsToVFFilter.h"
 #include "clitkBSplineDeformableTransform.h"
-#include "clitkTransformToDeformationFieldSource.h"
-#include "clitkShapedBLUTSpatioTemporalDeformableTransform.h"
+//#include "clitkTransformToDeformationFieldSource.h"
+//#include "clitkShapedBLUTSpatioTemporalDeformableTransform.h"
 #include "itkImageMaskSpatialObject.h"
 
-#include "clitkConvertBSplineDeformableTransformToVFGenericFilter.h"
+//#include "clitkConvertBSplineDeformableTransformToVFGenericFilter.h"
 #include "clitkVectorImageToImageFilter.h"
 #if ITK_VERSION_MAJOR >= 4
 #include "itkTransformToDisplacementFieldSource.h"
@@ -149,7 +149,12 @@ namespace clitk
       typedef clitk::VectorImageToImageFilter<BLUTCoefficientImageType, typename ITKTransformType::ImageType> FilterType;
       typename FilterType::Pointer component_filter[BLUTCoefficientImageType::ImageDimension];
 
+#if ITK_VERSION_MAJOR >= 4
+      typename ITKTransformType::CoefficientImageArray coefficient_images;
+#else
       typename ITKTransformType::ImagePointer coefficient_images[BLUTCoefficientImageType::ImageDimension];
+#endif
+
       for (unsigned int i=0; i < BLUTCoefficientImageType::ImageDimension; i++) {
           component_filter[i] = FilterType::New();
           component_filter[i]->SetInput(input);
@@ -157,7 +162,11 @@ namespace clitk
           component_filter[i]->Update();
           coefficient_images[i] = component_filter[i]->GetOutput();
       }
+#if ITK_VERSION_MAJOR >= 4
+      m_ITKTransform->SetCoefficientImages(coefficient_images);
+#else
       m_ITKTransform->SetCoefficientImage(coefficient_images);
+#endif
 
       m_GenericTransform = m_ITKTransform;
     }
@@ -169,8 +178,8 @@ namespace clitk
 
     m_Filter->Update();
 
-    SetNthOutput(0, m_Filter->GetOutput());
+    this->SetNthOutput(0, m_Filter->GetOutput());
   }
 
 
-}
\ No newline at end of file
+}