X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDict.cxx;h=3acd3fc310fe3db56d154c6508c14b96024ade12;hb=659604feaaaf9519d03d59d66711f6b4b8290804;hp=783073cc57ef2174de75c9d41f0ff0b031cd575e;hpb=b6e445adae1963909952eeef10ea7c1d2e0d3e0d;p=gdcm.git diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index 783073cc..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,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; } } @@ -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; } }