X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=ecef7934c3d3988d3e096d8da821c8af10f22017;hb=06a0fef14384fff540b619069c11e9dfaae2bbc6;hp=779d1b0e669eb7bd794f04f73072706343f2676f;hpb=f0022701102f3d16398d908a2b526fb36f334e31;p=gdcm.git diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index 779d1b0e..ecef7934 100644 --- a/src/gdcmDictSet.cxx +++ b/src/gdcmDictSet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictSet.cxx,v $ Language: C++ - Date: $Date: 2005/07/11 14:53:16 $ - Version: $Revision: 1.66 $ + Date: $Date: 2005/07/11 20:44:52 $ + Version: $Revision: 1.68 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -116,12 +116,19 @@ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group, // // const std::string tag = DictEntry::TranslateToKey(group,elem) // + "#" + vr + "#" + vm + "#" + name; +#if FASTTAGKEY && 0 + // FIXME + TagKey tag; + tag.tab[0] = group; + tag.tab[1] = elem; +#else char res[10]; sprintf(res,"%04x|%04x", group, elem); - TagKey tag = res; + ExtendedTagKey tag = res; tag += "#" + vr + "#" + vm + "#" + name; +#endif - TagKeyHT::iterator it; + ExtendedTagKeyHT::iterator it; it = VirtualEntries.find(tag); if ( it != VirtualEntries.end() ) @@ -132,7 +139,7 @@ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group, { DictEntry ent(group, elem, vr, vm, name); VirtualEntries.insert( - std::map::value_type(tag, ent) ); + ExtendedTagKeyHT::value_type(tag, ent) ); entry = &(VirtualEntries.find(tag)->second); }