X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOImageReader.cpp;h=4eb7fa3047e42f82685e1c9e2f9c3dd6620fc8e6;hb=refs%2Fheads%2Fvtk9itk5wx3-macos;hp=ecba3edb1fe35fe15db60215694920174b576a00;hpb=2db01242beca78a1ba142206668c50e59531fe47;p=creaImageIO.git

diff --git a/src/creaImageIOImageReader.cpp b/src/creaImageIOImageReader.cpp
index ecba3ed..3dec1c2 100644
--- a/src/creaImageIOImageReader.cpp
+++ b/src/creaImageIOImageReader.cpp
@@ -26,6 +26,7 @@
 */
 
 
+#include <vtkVersionMacros.h>
 #include <creaImageIOImageReader.h>
 #include <creaImageIOTreeAttributeDescriptor.h>
 #include <creaImageIOSystem.h>
@@ -44,6 +45,8 @@
 #include <vtkBMPReader.h>
 #include <vtkSLCReader.h>
 #include <vtkMetaImageReader.h>
+#include <vtkNIFTIImageReader.h>
+
 //#include <vtkGESignalReader.h>
 
 #include "boost/filesystem/path.hpp"
@@ -67,6 +70,8 @@ namespace creaImageIO
     Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkBMPReader::New(), "BMP", ".bmp")));
     Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkSLCReader::New())));
     Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkMetaImageReader::New(),"MHD",".mhd")));
+    Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkNIFTIImageReader::New(),"NIF",".nii.gz")));
+
     //   Register(new VtkImageReader(vtkGESignalReader::New()));
     Register(boost::shared_ptr<AbstractImageReader>(new DicomImageReader));
     Register(boost::shared_ptr<AbstractImageReader>(new UltrasonixImageReader));
@@ -157,7 +162,6 @@ namespace creaImageIO
   // Returns true iff the file is readable
   bool ImageReader::CanRead( const std::string& filename ) 
   {
-printf("EED ImageReader::CanRead Start\n");
 
     bool ok = false;
 
@@ -175,13 +179,10 @@ printf("EED ImageReader::CanRead Start\n");
 			{
 				mLastFilename = filename;
 				mLastReader = *i;
-printf("EED ImageReader::CanRead %s\n",mLastReader->GetName().c_str());
 				break;
 			}
 		}
 	}
-if (ok==true) printf("EED ImageReader::CanRead true End\n");
-if (ok==false) printf("EED ImageReader::CanRead false End\n");
 	return ok;
   }
   //=====================================================================
@@ -190,28 +191,21 @@ if (ok==false) printf("EED ImageReader::CanRead false End\n");
   // Reads the file (CanRead must be called before : no test here)
   vtkImageData*  ImageReader::ReadImage( const std::string& filename)
   {
-printf("EED ImageReader::ReadImage Start\n");
 		if (mLastFilename!=filename)
 		{
-printf("EED ImageReader::ReadImage 1\n");
 			if (!CanRead(filename))  
 			{ 
-printf("EED ImageReader::ReadImage 2\n");
 				vtkImageData* im = vtkImageData::New();
 				im->ShallowCopy(mUnreadableImage);
-printf("EED ImageReader::ReadImage END2\n");
 				return im;
 			} // CanRead
 		} // for mLastFilename
-printf("EED ImageReader::ReadImage 3\n");
 		vtkImageData* i = mLastReader->ReadImage(mLastFilename);
-printf("EED ImageReader::ReadImage 4\n");
 		if (i==NULL) 
 		{
 			i = vtkImageData::New();
 			i->ShallowCopy(mUnreadableImage);
 		} // i
-printf("EED ImageReader::ReadImage END1\n");
 
 		return i;
   }