BUG seed_arg was used instead of seedRadius_arg

[clitk.git] / registration / clitkShapedBLUTSpatioTemporalDIRGenericFilter.txx

diff --git a/registration/clitkShapedBLUTSpatioTemporalDIRGenericFilter.txx b/registration/clitkShapedBLUTSpatioTemporalDIRGenericFilter.txx
old mode 100755 (executable)
new mode 100644 (file)
index 5434b22..0ef06ab
--- a/registration/clitkShapedBLUTSpatioTemporalDIRGenericFilter.txx
+++ b/registration/clitkShapedBLUTSpatioTemporalDIRGenericFilter.txx
@@ -623,7 +623,7 @@ namespace clitk
     typename  MetricType::Pointer metric=genericMetric->GetMetricPointer();
     if (movingMask) metric->SetMovingImageMask(movingMask);
 
-#ifdef ITK_USE_OPTIMIZED_REGISTRATION_METHODS
+#if defined(ITK_USE_OPTIMIZED_REGISTRATION_METHODS) || ITK_VERSION_MAJOR >= 4
     if (threadsGiven) metric->SetNumberOfThreads( threads );
 #else
     if (m_Verbose) std::cout<<"Not setting the number of threads (not compiled with USE_OPTIMIZED_REGISTRATION_METHODS)..."<<std::endl;
@@ -819,7 +819,11 @@ namespace clitk
     typedef itk::WarpImageFilter< MovingImageType, FixedImageType, DeformationField4DType >    WarpFilterType;
     typename WarpFilterType::Pointer warp = WarpFilterType::New();
 
+#if ITK_VERSION_MAJOR >= 4
+    warp->SetDisplacementField( field4D );
+#else
     warp->SetDeformationField( field4D );
+#endif
     warp->SetInput( movingImageReader->GetOutput() );
     warp->SetOutputOrigin(  fixedImage->GetOrigin() );
     warp->SetOutputSpacing( fixedImage->GetSpacing() );