X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIODicomImageReader.cpp;h=7f608f016d9815f334e98a15831eeb2599a7b470;hb=7805f0d563d5ba9be6022f8016c589b57c287f1d;hp=0e92f024b2fa9c4ce74df31f66f4cea4b28c29eb;hpb=79372affb878a3ffd7896b8ffbb06b564c0550ce;p=creaImageIO.git diff --git a/src/creaImageIODicomImageReader.cpp b/src/creaImageIODicomImageReader.cpp index 0e92f02..7f608f0 100644 --- 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; }