* Remove memory leaks on the DicomDir

[gdcm.git] / src / gdcmDicomDirImage.cxx

diff --git a/src/gdcmDicomDirImage.cxx b/src/gdcmDicomDirImage.cxx
index 1d08986925166d908e0fa1a54535d56206ecc44c..5a12172ec205491405edcca6737a78b2b94e2da9 100644 (file)
--- a/src/gdcmDicomDirImage.cxx
+++ b/src/gdcmDicomDirImage.cxx
@@ -1,58 +1,68 @@
-// gdcmDicomDirImage.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirImage.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/12/03 17:13:18 $
+  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.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmDicomDirImage.h"
+#include "gdcmValEntry.h"
 
+namespace gdcm 
+{
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
-
 /**
- * \ingroup gdcmDicomDirImage
- * \brief   
- * @param  begin  iterator (inside the gdcmParser chained list)
- *                on the first Header Entry (i.e Dicom Element)
- *                related to this "IMAGE" part
- * @param  end  iterator  (inside the gdcmParser chained list)
- *              on the last Header Entry (i.e Dicom Element) 
- *              related to this 'IMAGE' part
- * @param ptagHT pointer to the HTable (gdcmObject needs it 
- *               to build the gdcmHeaderEntries)
- * @param plistEntries pointer to the chained List (gdcmObject needs it 
- *               to build the gdcmHeaderEntries)
+ * \ingroup DicomDirImage
+ * \brief  Constructor 
+ * @param ptagHT pointer to the HTable (DicomDirObject needs it 
+ *               to build the DocEntries)
  */
-gdcmDicomDirImage::gdcmDicomDirImage(ListTag::iterator begin,
-                                     ListTag::iterator end,
-                                     TagHeaderEntryHT *ptagHT, 
-                                    ListTag *plistEntries):
-   gdcmObject(begin,end,ptagHT,plistEntries)
+DicomDirImage::DicomDirImage():
+   DicomDirObject()
 {
 }
-
 /**
- * \ingroup gdcmDicomDirImage
+ * \ingroup DicomDirImage
  * \brief   Canonical destructor.
  */
-gdcmDicomDirImage::~gdcmDicomDirImage() 
+DicomDirImage::~DicomDirImage() 
 {
 }
 
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmDicomDirImage
+ * \ingroup DicomDirImage
  * \brief   Prints the Object
  * @return
  */ 
-void gdcmDicomDirImage::Print(std::ostream &os)
+void DicomDirImage::Print(std::ostream &os)
 {
-   os<<"IMAGE : ";
-   for(ListTag::iterator i=beginObj;i!=endObj;++i)
+   os << "IMAGE : ";
+   for(ListDocEntry::iterator i = DocEntries.begin();
+                              i!= DocEntries.end();
+                              ++i)
    {
-      if( ((*i)->GetGroup()==0x0004) && ((*i)->GetElement()==0x1500) )
-         os<<(*i)->GetValue();
+      if( (*i)->GetGroup() == 0x0004 && (*i)->GetElement() == 0x1500 )
+      {
+         os << ((ValEntry *)(*i))->GetValue(); //FIXME
+      }
    }
-   os<<std::endl;
+   os << std::endl;
 
-   gdcmObject::Print(os);
+   DicomDirObject::Print(os);
 }
 
 //-----------------------------------------------------------------------------
@@ -65,3 +75,5 @@ void gdcmDicomDirImage::Print(std::ostream &os)
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm
+