X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIODicomImageReader.cpp;h=66c1b008b68410b895b757e515baae66fcf6b200;hb=6af4831637e7dbc737fc8a42ae1395ee94658103;hp=96d56724d04446da73144a5af94445602c1c06d2;hpb=a67d921cdc10d438852b48c2985f14d91320e016;p=creaImageIO.git diff --git a/src2/creaImageIODicomImageReader.cpp b/src2/creaImageIODicomImageReader.cpp index 96d5672..66c1b00 100644 --- a/src2/creaImageIODicomImageReader.cpp +++ b/src2/creaImageIODicomImageReader.cpp @@ -30,8 +30,7 @@ namespace creaImageIO //===================================================================== bool DicomImageReader::CanRead(const std::string& filename) { - - GDCM_NAME_SPACE::Document*doc; + 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()); @@ -50,7 +49,6 @@ namespace creaImageIO //===================================================================== vtkImageData* DicomImageReader::ReadImage(const std::string& filename) { - vtkImageData* im = 0; try { @@ -66,7 +64,7 @@ namespace creaImageIO } return im; } - + //===================================================================== void DicomImageReader::PushBackExtensions(std::vector& v) { @@ -90,7 +88,6 @@ namespace creaImageIO { return str.substr(0,str.size()-1); } - return str; } //======================================================================== @@ -99,14 +96,13 @@ namespace creaImageIO void DicomImageReader::ReadAttributes(const std::string& filename, std::map& attr) { - GimmickMessage(2,"Reading attributes from DICOM file '" <SetLoadMode( GDCM_NAME_SPACE::LD_ALL); + GDCM_NAME_SPACE::File* file = GDCM_NAME_SPACE::File::New(); + + GDCM_NAME_SPACE::Document *doc= GDCM_NAME_SPACE::File::New(); + doc->SetLoadMode( GDCM_NAME_SPACE::LD_ALL); doc->SetFileName(filename.c_str()); doc->Load(); file->SetLoadMode( GDCM_NAME_SPACE::LD_ALL); @@ -114,7 +110,6 @@ namespace creaImageIO file->Load(); if (file->IsReadable() ||((GDCM_NAME_SPACE::Document*) file)->IsReadable()) { - std::map::iterator i; for (i=attr.begin();i!=attr.end();++i) { @@ -149,7 +144,7 @@ namespace creaImageIO } file->Delete(); } - + //===================================================================== } // namespace creaImageIO