X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntryArchive.cxx;h=d3213c26164a01137aa76aa2100575b19ad59f6c;hb=b06cbd9177331d793223eac6bf8b2bccf874e7e3;hp=c82a1e96c2c779a8010788813bf56c45468b87b5;hpb=4f189b7cd8d7aff962887245b7b30ede39b7856c;p=gdcm.git

diff --git a/src/gdcmDocEntryArchive.cxx b/src/gdcmDocEntryArchive.cxx
index c82a1e96..d3213c26 100644
--- a/src/gdcmDocEntryArchive.cxx
+++ b/src/gdcmDocEntryArchive.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntryArchive.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/24 16:00:47 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2007/05/23 14:18:09 $
+  Version:   $Revision: 1.19 $
                                                                                 
   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 <string>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -56,12 +56,17 @@ bool DocEntryArchive::Push(DocEntry *newEntry)
    if ( !newEntry )
       return false;
 
-   uint16_t group = newEntry->GetDictEntry()->GetGroup();
-   uint16_t elem  = newEntry->GetDictEntry()->GetElement();
-   TagKey key = DictEntry::TranslateToKey(group,elem);
+   //uint16_t group = newEntry->GetDictEntry()->GetGroup();
+   //uint16_t elem  = newEntry->GetDictEntry()->GetElement();
+   //TagKey key = DictEntry::TranslateToKey(group,elem);
 
+   TagKey key = newEntry->GetKey();
+   
    if ( Archive.find(key) == Archive.end() )
    {
+      uint16_t group = newEntry->GetGroup();
+      uint16_t elem  = newEntry->GetElement();
+      
       // Save the old DocEntry if any
       DocEntry *old = ArchFile->GetDocEntry(group, elem);
       Archive[key]  = old;
@@ -89,8 +94,8 @@ bool DocEntryArchive::Push(DocEntry *newEntry)
  */
 bool DocEntryArchive::Push(uint16_t group, uint16_t elem)
 {
-   TagKey key = DictEntry::TranslateToKey(group, elem);
-
+   //TagKey key = DictEntry::TranslateToKey(group, elem);
+   TagKey key(group, elem);
    if ( Archive.find(key)==Archive.end() )
    {
       // Save the old DocEntry if any
@@ -117,8 +122,8 @@ bool DocEntryArchive::Push(uint16_t group, uint16_t elem)
  */
 bool DocEntryArchive::Restore(uint16_t group, uint16_t elem)
 {
-   TagKey key=DictEntry::TranslateToKey(group, elem);
-
+   //TagKey key=DictEntry::TranslateToKey(group, elem);
+   TagKey key(group, elem);
    TagDocEntryHT::iterator restoreIt=Archive.find(key);
    if ( restoreIt!=Archive.end() )
    {