X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=3e88c55f0a4f9728c6c8e7831abe734b7f4e18b3;hb=01940747ce53f8c87bc883c47fd152e787e73b07;hp=ad21049b400fd6a77527507b4b09a86ad1ddc7bc;hpb=ba0a18abbcfc4963482d968fdc684f31fa995241;p=gdcm.git diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx index ad21049b..3e88c55f 100644 --- a/src/gdcmDictEntry.cxx +++ b/src/gdcmDictEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictEntry.cxx,v $ Language: C++ - Date: $Date: 2005/06/07 14:50:36 $ - Version: $Revision: 1.48 $ + Date: $Date: 2005/07/11 15:20:46 $ + Version: $Revision: 1.51 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -22,7 +22,7 @@ #include // for std::ios::left, ... #include -#include // for sprintf, grrrr +#include // for sprintf namespace gdcm { @@ -33,8 +33,8 @@ namespace gdcm * @param group DICOM-Group Number * @param elem DICOM-Element Number * @param vr Value Representation - * @param vm Value Mutlplicity - * @param name description of the element + * @param vm Value Multiplicity + * @param name description of the element */ DictEntry::DictEntry(uint16_t group, uint16_t elem, @@ -100,9 +100,16 @@ TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t elem) // Let's try to shorten it ! //return Util::Format("%04x|%04x", group, elem); // too much time ! +#if FASTTAGKEY + TagKey r; + r.tab[0] = group; + r.tab[1] = elem; + return r; +#else char res[10]; sprintf(res,"%04x|%04x", group, elem); return res; +#endif } //----------------------------------------------------------------------------- @@ -124,13 +131,13 @@ void DictEntry::Print(std::ostream &os, std::string const & ) std::ostringstream s; vr = GetVR(); - if(vr==GDCM_UNKNOWN) + if ( vr==GDCM_UNKNOWN ) vr=" "; s << DictEntry::TranslateToKey(GetGroup(),GetElement()); s << " [" << vr << "] "; - if (PrintLevel >= 1) + if ( PrintLevel >= 1 ) { s.setf(std::ios::left); s << std::setw(66-GetName().length()) << " ";