* Remove memory leaks

[gdcm.git] / src / gdcmDicomDir.cxx

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index ee3fb0eb8709e330c88a5b5a5ed172ed8b0e1aab..17da13ee9e5aebf45bb5bc7c44590a3e3c163607 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/21 16:02:01 $
-  Version:   $Revision: 1.164 $
+  Date:      $Date: 2005/10/25 09:22:15 $
+  Version:   $Revision: 1.166 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -319,8 +319,8 @@ DicomDirMeta *DicomDir::NewMeta()
          if ( dynamic_cast<SeqEntry *>(entry) )
             break;
 
-         RemoveEntryNoDestroy(entry);
          MetaElems->AddEntry(entry);
+         RemoveEntry(entry);
 
          entry = GetFirstEntry();
       }
@@ -737,6 +737,7 @@ void DicomDir::CreateDicomDir()
    //  3 - we find an other tag
    //       + we create the object for the precedent tag
    //       + loop to 1 -
+   gdcmDebugMacro("Create DicomDir");
 
    // Directory record sequence
    DocEntry *e = GetDocEntry(0x0004, 0x1220);
@@ -1092,8 +1093,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type,
       tmpEl     = it->Elem;
       dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl);
 
-      entry     = new DataEntry( dictEntry ); // Be sure it's never a DataEntry !
-
+      entry     = DataEntry::New( dictEntry ); 
       entry->SetOffset(0); // just to avoid further missprinting
 
       if ( header )
@@ -1144,6 +1144,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type,
          gdcmWarningMacro("GDCM_DICOMDIR_META ?!? should never print that");
       }
       si->AddEntry(entry);
+      entry->Delete();
    }
 }
 
@@ -1160,7 +1161,7 @@ void DicomDir::MoveSQItem(DocEntrySet *dst,DocEntrySet *src)
    entry = src->GetFirstEntry();
    while(entry)
    {
-      src->RemoveEntryNoDestroy(entry);
+      src->RemoveEntry(entry);
       dst->AddEntry(entry);
       // we destroyed -> the current iterator is not longer valid
       entry = src->GetFirstEntry();