X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIODicomImageReader.cpp;h=9390d1704a55acc790762864ef78eb34b4bcdcbe;hb=a00e6172593c713640aaa9bf1e61db6200231a0f;hp=30c420914cc2a7ca00c96aa8ce979fd666be0ddd;hpb=b0843014c5482f70050fab8036c6780172e3b6c9;p=creaImageIO.git diff --git a/src2/creaImageIODicomImageReader.cpp b/src2/creaImageIODicomImageReader.cpp index 30c4209..9390d17 100644 --- a/src2/creaImageIODicomImageReader.cpp +++ b/src2/creaImageIODicomImageReader.cpp @@ -6,7 +6,10 @@ #include #include - +#include +#ifdef _DEBUG +#define new DEBUG_NEW +#endif namespace creaImageIO { @@ -82,11 +85,11 @@ namespace creaImageIO } if (str[str.size()-1]==' ') { - return str.substr(0,str.size()-1); + return irclean(str.substr(0,str.size()-1)); } if (str[str.size()-1]==0) { - return str.substr(0,str.size()-1); + return irclean(str.substr(0,str.size()-1)); } } @@ -134,18 +137,18 @@ namespace creaImageIO } else { - uint16_t gr; uint16_t el; + uint16_t gr; + tree::AttributeDescriptor::GetDicomGroupElementFromKey(i->first,gr,el); if ( ( gr!=0 ) && ( el!=0 ) ) { - std::string val = file->GetEntryString(gr,el); + std::string val = file->GetEntryString(gr,el); i->second = irclean(val); } } } } - // file->Delete(); } //=====================================================================