BUG: Remove tons of mem leaks. There are still plenty that explains why gdcm is dog...

[gdcm.git] / src / gdcmDicomDirMeta.cxx

diff --git a/src/gdcmDicomDirMeta.cxx b/src/gdcmDicomDirMeta.cxx
index 116acf30bb08a54eb0cb35082332e3f44fa3ca51..985d7516e08cd220f590ea70b0c30e0237085773 100644 (file)
--- a/src/gdcmDicomDirMeta.cxx
+++ b/src/gdcmDicomDirMeta.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirMeta.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/09/23 10:47:10 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2004/10/25 03:35:19 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -19,24 +19,27 @@
 #include "gdcmDicomDirMeta.h"
 #include "gdcmDocument.h"
 
+namespace gdcm 
+{
+
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 
 /**
- * \ingroup gdcmMeta
+ * \ingroup DicomDirMeta
  * \brief  Constructor
  */ 
-gdcmDicomDirMeta::gdcmDicomDirMeta(TagDocEntryHT *ptagHT):
-   gdcmDicomDirObject(ptagHT)
+DicomDirMeta::DicomDirMeta(TagDocEntryHT* ptagHT):
+   DicomDirObject(ptagHT)
 {
 
 }
 
 /**
- * \ingroup gdcmDicomDirMeta
+ * \ingroup DicomDirMeta
  * \brief   Canonical destructor.
  */
-gdcmDicomDirMeta::~gdcmDicomDirMeta() 
+DicomDirMeta::~DicomDirMeta() 
 {
    
 }
@@ -46,12 +49,12 @@ gdcmDicomDirMeta::~gdcmDicomDirMeta()
 /**
  * \brief   Prints the Meta Elements
  */ 
-void gdcmDicomDirMeta::Print(std::ostream &os)
+void DicomDirMeta::Print(std::ostream& os)
 {
    os << "META" << std::endl;
-   // warning : META doesn't behave exactly like a gdcmObjet 
-   for (ListDocEntry::iterator i = docEntries.begin();  
-        i != docEntries.end();
+   // warning : META doesn't behave exactly like a Objet 
+   for (ListDocEntry::iterator i = DocEntries.begin();  
+        i != DocEntries.end();
         ++i)
       (*i)->Print();    
 }
@@ -65,12 +68,14 @@ void gdcmDicomDirMeta::Print(std::ostream &os)
  * \brief   Writes the Meta Elements
  * @return
  */ 
-void gdcmDicomDirMeta::Write(FILE *fp, FileType t)
+void DicomDirMeta::Write(std::ofstream* fp, FileType t)
 {   
-   for (ListDocEntry::iterator i = docEntries.begin();  
-        i != docEntries.end();
-        ++i)
-      (*i)->Write(fp, t);   
+   for (ListDocEntry::iterator i = DocEntries.begin();  
+                              i != DocEntries.end();
+                              ++i)
+   {
+      (*i)->Write(fp, t);
+   }
 }
 
 //-----------------------------------------------------------------------------
@@ -80,3 +85,5 @@ void gdcmDicomDirMeta::Write(FILE *fp, FileType t)
 // Private
 
 //-----------------------------------------------------------------------------
+
+} // end namespace gdcm