X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=ec3301a4c573b873f3d3b15168e2dca32b3e7fe5;hb=61e31793469693089755b17ffc62e8ccd028a6ed;hp=779d1b0e669eb7bd794f04f73072706343f2676f;hpb=f0022701102f3d16398d908a2b526fb36f334e31;p=gdcm.git

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 779d1b0e..ec3301a4 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/10/18 12:58:27 $
+  Version:   $Revision: 1.69 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -106,9 +106,9 @@ Dict *DictSet::GetDict(DictKey const &dictName)
  */
 DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
                                          uint16_t elem,
-                                         TagName vr,
-                                         TagName vm,
-                                         TagName name)
+                                         const VRKey &vr,
+                                         const TagName &vm,
+                                         const TagName &name)
 {
    DictEntry *entry;
 
@@ -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;
-   tag += "#" + vr + "#" + vm + "#" + name;  
-  
-   TagKeyHT::iterator it;
+   ExtendedTagKey tag = res;
+   tag += "#" + vr.str() + "#" + vm + "#" + name;  
+#endif
+
+   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<TagKey, DictEntry>::value_type(tag, ent) );
+         ExtendedTagKeyHT::value_type(tag, ent) );
       entry = &(VirtualEntries.find(tag)->second);
    }