X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=3acd3fc310fe3db56d154c6508c14b96024ade12;hb=3a7de562dd07854a96a0a148e1c95652baefe2c8;hp=2b8dff9e2b58fa2e9b86696cd694b6ecbcf99272;hpb=cbdf7d814e2c43c37dff624581dd77ac178e9ce7;p=gdcm.git diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index 2b8dff9e..3acd3fc3 100644 --- a/src/gdcmDict.cxx +++ b/src/gdcmDict.cxx @@ -1,9 +1,8 @@ // gdcmDict.cxx -#include #include "gdcmDict.h" #include "gdcmUtil.h" -using namespace std; +#include /** * \ingroup gdcmDict @@ -32,7 +31,7 @@ gdcmDict::gdcmDict(std::string & FileName) { from.getline(buff, 256, '\n'); name = buff; gdcmDictEntry * newEntry = new gdcmDictEntry(group, element, - vr, fourth, name); + vr, fourth, name); // FIXME: use AddNewEntry NameHt[name] = newEntry; KeyHt[gdcmDictEntry::TranslateToKey(group, element)] = newEntry; @@ -75,11 +74,11 @@ void gdcmDict::Print(std::ostream& os) { void gdcmDict::PrintByKey(std::ostream& os) { for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag){ os << "Tag : "; - os << "(" << hex << tag->second->GetGroup() << ','; - os << hex << tag->second->GetElement() << ") = " << dec; + os << "(" << std::hex << tag->second->GetGroup() << ','; + os << std::hex << tag->second->GetElement() << ") = " << std::dec; os << tag->second->GetVR() << ", "; os << tag->second->GetFourth() << ", "; - os << tag->second->GetName() << "." << endl; + os << tag->second->GetName() << "." << std::endl; } } @@ -96,7 +95,7 @@ void gdcmDict::PrintByName(std::ostream& os) { os << tag->second->GetVR() << ", "; os << tag->second->GetFourth() << ", "; os << "(" << std::hex << tag->second->GetGroup() << ','; - os << std::hex << tag->second->GetElement() << ") = " << dec << std::endl; + os << std::hex << tag->second->GetElement() << ") = " << std::dec << std::endl; } }