#3218 creaImageIO Feature New Normal - vtk8itk4wx3-mingw64

[creaImageIO.git] / src / creaImageIODicomImageReader.cpp

diff --git a/src/creaImageIODicomImageReader.cpp b/src/creaImageIODicomImageReader.cpp
index 70736d94278aa83d86691e2c03d6f44c4620b06c..7f608f016d9815f334e98a15831eeb2599a7b470 100644 (file)
--- a/src/creaImageIODicomImageReader.cpp
+++ b/src/creaImageIODicomImageReader.cpp
@@ -66,14 +66,14 @@ namespace creaImageIO
     GDCM_NAME_SPACE::Document*doc;
     GDCM_NAME_SPACE::File* file = GDCM_NAME_SPACE::File::New();
     file->SetLoadMode( GDCM_NAME_SPACE::LD_ALL);
-    file->SetFileName(filename.c_str());
+    file->SetFileName( filename );
     file->Load();
     bool ok = file->IsReadable();
        if(!ok)
        {
                doc = (GDCM_NAME_SPACE::Document*)file; 
                ok = doc->IsReadable();
-       }
+       } // if ok
     file->Delete();
     return ok;
   }
@@ -84,17 +84,15 @@ namespace creaImageIO
   {
     vtkImageData* im = 0;
     try
-      {
-       mReader->SetFileName(filename.c_str());
-       mReader->Update();
-       im = vtkImageData::New();
-       im->ShallowCopy(mReader->GetOutput());
-      }
-    catch (...)
-      {
-       if (im!=0) im->Delete();
-         im = 0;
-      }
+    {
+               mReader->SetFileName(filename.c_str());
+               mReader->Update();
+               im = vtkImageData::New();
+               im->ShallowCopy(mReader->GetOutput());
+    } catch (...) {
+               if (im!=0) im->Delete();
+               im = 0;
+    }
     return im;
   }
 
@@ -163,7 +161,7 @@ namespace creaImageIO
            if ( i->first == "D0004_1500" )
              {
                boost::filesystem::path full_path(filename);
-               std::string f = full_path.leaf();
+               std::string f = full_path.leaf().string();
                i->second = f;
              }
            else if ( i->first == "FullFileName" )