X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=3acd3fc310fe3db56d154c6508c14b96024ade12;hb=fc41bb9afa4edfc95108e8fe9ab8c2554835dd0f;hp=7e4f586b8c7ad32a8de67a00f4dd97db96e9f58f;hpb=b950a88db3b779f409f548361bbc62882094b9fb;p=gdcm.git diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index 7e4f586b..3acd3fc3 100644 --- a/src/gdcmDict.cxx +++ b/src/gdcmDict.cxx @@ -1,18 +1,8 @@ // gdcmDict.cxx -//This is needed when compiling in debug mode -#ifdef _MSC_VER -// 'identifier' : class 'type' needs to have dll-interface to be used by -// clients of class 'type2' -#pragma warning ( disable : 4251 ) -// 'identifier' : identifier was truncated to 'number' characters in the -// debug information -#pragma warning ( disable : 4786 ) -#endif //_MSC_VER - -#include #include "gdcmDict.h" #include "gdcmUtil.h" +#include /** * \ingroup gdcmDict @@ -84,8 +74,8 @@ 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() << "." << std::endl; @@ -105,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; } }