]> Creatis software - creaImageIO.git/commitdiff
minor bug corrections
authorFrederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Fri, 18 Sep 2009 14:32:17 +0000 (14:32 +0000)
committerFrederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Fri, 18 Sep 2009 14:32:17 +0000 (14:32 +0000)
src2/creaImageIOImageReader.cpp

index b1f9279e47a7412c525c21ba847a8abc6698ba3e..54257c1abc7fa45ea2fe87807f48ee28c5d6ddc5 100644 (file)
@@ -36,8 +36,9 @@ namespace creaImageIO
     //    std::cout << "#### ImageReader::ImageReader()"<<std::endl;
     if (mUnreadableImage!=0) return;
 
-    Register(new VtkImageReader(vtkPNGReader::New()));
-    Register(new VtkImageReader(vtkTIFFReader::New()));
+
+    Register(new VtkImageReader(vtkPNGReader::New(), "PNG", ".png"));
+    Register(new VtkImageReader(vtkTIFFReader::New(), "JPEG", ".jpeg"));
     Register(new VtkImageReader(vtkJPEGReader::New()));
     Register(new VtkImageReader(vtkBMPReader::New()));
     Register(new VtkImageReader(vtkSLCReader::New()));
@@ -98,18 +99,22 @@ namespace creaImageIO
   bool ImageReader::CanRead( const std::string& filename ) 
   {
     bool ok = false;
-    std::vector<AbstractImageReader*>::iterator i;
-    for (i=mReader.begin(); i!=mReader.end(); i++)
-      {
-       ok = (*i)->CanRead(filename);
-       if (ok) 
-         {
-           mLastFilename = filename;
-           mLastReader = *i;
-           break;
-         }
-      }
-    return ok;
+       if(filename != "")
+       {
+           std::vector<AbstractImageReader*>::iterator i;
+               for (i=mReader.begin(); i!=mReader.end(); i++)
+               {
+                       ok = (*i)->CanRead(filename);
+                       if (ok) 
+                       {
+                               mLastFilename = filename;
+                               mLastReader = *i;
+                               break;
+                       }
+               }
+       }
+       return ok;
+       
   }
   //=====================================================================