From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Mon, 14 Jan 2013 15:27:24 +0000 (+0100)
Subject: Remove itkAnalyzeImageIO
X-Git-Tag: v1.4.0~236^2~12
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3f1a99051165ef065b28fdf25b9fdecefdaca4af;p=clitk.git

Remove itkAnalyzeImageIO

- itkAnalyzeImageIO was used to force identity matrix when reading
analyze images. itk now uses another reader that does not apply fancy
matrix when reading analyze file, previous code is not needed anymore.
---

diff --git a/common/vvImageReader.txx b/common/vvImageReader.txx
index 9b0e21a..3ef04c6 100644
--- a/common/vvImageReader.txx
+++ b/common/vvImageReader.txx
@@ -23,7 +23,6 @@
 #include <itkImageFileReader.h>
 #include <itkImageSeriesReader.h>
 #include <itkImageToVTKImageFilter.h>
-#include <itkAnalyzeImageIO.h>
 #include <itkFlexibleVectorCastImageFilter.h>
 
 #include <vtkTransform.h>
@@ -73,8 +72,6 @@ void vvImageReader::UpdateWithDim(std::string InputPixelType)
 template<class InputPixelType, unsigned int VImageDimension>
 void vvImageReader::UpdateWithDimAndInputPixelType()
 {
-  itk::AnalyzeImageIO *analyzeImageIO = NULL;
-
   if (mType == MERGEDWITHTIME)   // In this case we can load the images
     // one at the time to avoid excessive
     // memory use
@@ -97,7 +94,6 @@ void vvImageReader::UpdateWithDimAndInputPixelType()
         mLastError = error.str();
         return;
       }
-      analyzeImageIO = dynamic_cast<itk::AnalyzeImageIO*>( reader->GetImageIO() );
     }
   } else if (mType == SLICED) {
     mImage=vvImage::New();
@@ -134,7 +130,6 @@ void vvImageReader::UpdateWithDimAndInputPixelType()
                 << "(slice #" << mSlice << ") " << err << std::endl;
       return;
     }
-    analyzeImageIO = dynamic_cast<itk::AnalyzeImageIO*>( reader->GetImageIO() );
   } else {
     if (mInputFilenames.size() > 1) {
       typedef itk::Image< InputPixelType, VImageDimension > InputImageType;
@@ -177,23 +172,6 @@ void vvImageReader::UpdateWithDimAndInputPixelType()
         mLastError = error.str();
         return;
       }
-      analyzeImageIO = dynamic_cast<itk::AnalyzeImageIO*>( reader->GetImageIO() );
-    }
-  }
-
-  // For unknown analyze orientations, we set identity
-  if(analyzeImageIO) {
-    const double m[16] = {1.,0.,0.,0.,
-                          0.,0.,1.,0.,
-                          0.,-1.,0.,0.,
-                          0.,0.,0.,1.};
-    // TODO SR and BP: check on the list of transforms and not the first only
-    int i;
-    for(i=0; i<16 && m[i]==mImage->GetTransform()[0]->GetMatrix()->GetElement(i%4, i/4); i++);
-    if(i==16) {
-      itkWarningMacro(<< "Analyze image file format detected with unknown orientation. "
-                      << "Forcing identity orientation, use other file format if not ok.");
-      mImage->GetTransform()[0]->Identity();
     }
   }
 }
@@ -203,8 +181,6 @@ void vvImageReader::UpdateWithDimAndInputPixelType()
 template<class InputPixelType, unsigned int VImageDimension>
 void vvImageReader::UpdateWithDimAndInputVectorPixelType()
 {
-  itk::AnalyzeImageIO *analyzeImageIO = NULL;
-
   typedef itk::Image< InputPixelType, VImageDimension > InputImageType;
   typename InputImageType::Pointer input;
 
@@ -239,7 +215,6 @@ void vvImageReader::UpdateWithDimAndInputVectorPixelType()
       mLastError = error.str();
       return;
     }
-    analyzeImageIO = dynamic_cast<itk::AnalyzeImageIO*>( reader->GetImageIO() );
   }
   
   typedef itk::Image< itk::Vector<float , 3>, VImageDimension > VectorImageType;
@@ -251,24 +226,6 @@ void vvImageReader::UpdateWithDimAndInputVectorPixelType()
   casted_input = caster->GetOutput();
   
   mImage = vvImageFromITK<VImageDimension, itk::Vector<float, 3> >(casted_input, mType == IMAGEWITHTIME || mType == VECTORFIELDWITHTIME);
-
-  // For unknown analyze orientations, we set identity
-  if (analyzeImageIO)
-  {
-    const double m[16] = {1.,0.,0.,0.,
-                          0.,0.,1.,0.,
-                          0.,-1.,0.,0.,
-                          0.,0.,0.,1.};
-    int i;
-    for (i = 0; i < 16 && m[i] == mImage->GetTransform()[0]->GetMatrix()->GetElement(i % 4, i / 4); i++)
-      ;
-    if (i == 16)
-    {
-      itkWarningMacro(<< "Analyze image file format detected with unknown orientation. "
-                      << "Forcing identity orientation, use other file format if not ok.");
-      mImage->GetTransform()[0]->Identity();
-    }
-  }
 }
 //----------------------------------------------------------------------------