add std::string Orientation::GetOrientation ( File *f ) method, that

[gdcm.git] / src / gdcmDictSet.cxx

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 646d3374ab2e0dd3c7c9c3373ff0fbbe13c6d467..ecef7934c3d3988d3e096d8da821c8af10f22017 100644 (file)
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/06/24 10:55:58 $
-  Version:   $Revision: 1.65 $
+  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);
-   std::string 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<TagKey, DictEntry>::value_type(tag, ent) );
+         ExtendedTagKeyHT::value_type(tag, ent) );
       entry = &(VirtualEntries.find(tag)->second);
    }