From: Romulo Pinho <romulo.pinho@lyon.unicancer.fr>
Date: Tue, 21 Feb 2012 14:26:05 +0000 (+0100)
Subject: Revert "corrected error when opening 4D vector fields"
X-Git-Tag: v1.3.0~95
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=cc2f3e22307a2ddb835c4ae15dbe5302a143653f;p=clitk.git

Revert "corrected error when opening 4D vector fields"

This reverts commit 832f2cee39cf5f9c4eab850124dff5c96ea0b15c.
---

diff --git a/common/vvImageReader.txx b/common/vvImageReader.txx
index 6a4333f..e15e6d7 100644
--- a/common/vvImageReader.txx
+++ b/common/vvImageReader.txx
@@ -24,7 +24,7 @@
 #include <itkImageSeriesReader.h>
 #include <itkImageToVTKImageFilter.h>
 #include <itkAnalyzeImageIO.h>
-#include <itkFlexibleVectorCastImageFilter.h>
+#include <itkVectorCastImageFilter.h>
 
 #include <vtkTransform.h>
 
@@ -36,12 +36,7 @@ template<unsigned int VImageDimension>
 void vvImageReader::UpdateWithDim(std::string InputPixelType)
 {
   if (mType == VECTORFIELD || mType == VECTORFIELDWITHTIME)
-  {
-    if (VImageDimension == 4)
-      UpdateWithDimAndInputVectorPixelType<itk::Vector<float,3>,VImageDimension>();
-    else
-      UpdateWithDimAndInputVectorPixelType<itk::Vector<float,VImageDimension>,VImageDimension>();
-  }
+    UpdateWithDimAndInputVectorPixelType<itk::Vector<float,VImageDimension>,VImageDimension>();
   else if (InputPixelType == "short")
     UpdateWithDimAndInputPixelType<short,VImageDimension>();
   else if (InputPixelType == "unsigned_short")
@@ -240,15 +235,14 @@ void vvImageReader::UpdateWithDimAndInputVectorPixelType()
     }
     analyzeImageIO = dynamic_cast<itk::AnalyzeImageIO*>( reader->GetImageIO() );
   }
-  
+
   typedef itk::Image< itk::Vector<float , 3>, VImageDimension > VectorImageType;
-  typedef itk::FlexibleVectorCastImageFilter<InputImageType, VectorImageType> CasterType;
+  typedef itk::VectorCastImageFilter<InputImageType, VectorImageType> CasterType;
   typename VectorImageType::Pointer casted_input;
   typename CasterType::Pointer caster = CasterType::New();
   caster->SetInput(input);
-  caster->Update();
   casted_input = caster->GetOutput();
-  
+
   mImage = vvImageFromITK<VImageDimension, itk::Vector<float, 3> >(casted_input, mType == IMAGEWITHTIME || mType == VECTORFIELDWITHTIME);
 
   // For unknown analyze orientations, we set identity