COMP: Solve both problem of push_back missing in VS6 (already fixed) and no need...

[gdcm.git] / src / gdcmDicomDir.cxx

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 97d1f3dec03d6e7b2a80e8b695b216e62da6c81e..4ef11dd20b28ccb80cbfe14261cc5e25d9cd9368 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/01/25 15:44:23 $
-  Version:   $Revision: 1.118 $
+  Date:      $Date: 2005/01/28 15:58:40 $
+  Version:   $Revision: 1.121 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -461,18 +461,14 @@ void DicomDir::CreateDicomDirChainedList(std::string const & path)
 
 /**
  * \brief   adds *the* Meta to a partially created DICOMDIR
- */
-  
+ */  
 DicomDirMeta *DicomDir::NewMeta()
 {
    if( MetaElems )
       delete MetaElems;
 
- // friend class hunting : we miss GetLastEntry and GetPreviousEntry
- //                  to be able to remove any direct reference to TagHT
    DocEntry *entry = GetFirstEntry();
    if( entry )
-   //if ( TagHT.begin() != TagHT.end() ) // after Document Parsing
    { 
       MetaElems = new DicomDirMeta(true);
 
@@ -487,16 +483,6 @@ DicomDirMeta *DicomDir::NewMeta()
 
          entry = GetFirstEntry();
       }
-      /*TagDocEntryHT::iterator lastOneButSequence = TagHT.end();
-      lastOneButSequence --;
-      // ALL the 'out of Sequence' Tags belong to Meta Elems
-      // (we skip 0004|1220 [Directory record sequence] )
-      for ( TagDocEntryHT::iterator cc  = TagHT.begin(); 
-                                    cc != lastOneButSequence;
-                                   ++cc)
-      {
-         MetaElems->AddEntry( cc->second );
-      }*/
    }
    else  // after root directory parsing
    {
@@ -830,12 +816,8 @@ void DicomDir::CreateDicomDir()
          // neither an 'IMAGE' SQItem. Skip to next item.
          continue;
       }
-
-      //if( si )
-         //MoveSQItem(si,tmpSI);
       tmpSI=s->GetNextSQItem();
    }
-// friend hunting : this one will be difficult to remove !
    ClearEntry();
 }