upgrades for 4DSplitter

[gdcm.git] / src / gdcmDocument.cxx

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 5aa5a850085a165c0119726de8b2022bd1988d31..284fe5e6fee561ab73a129a052ac542318acbb84 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/07/01 11:13:09 $
-  Version:   $Revision: 1.384 $
+  Date:      $Date: 2011/03/29 07:36:00 $
+  Version:   $Revision: 1.386 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1129,7 +1129,6 @@ void Document::ParseDES(DocEntrySet *set, long offset,
       std::cout << std::dec <<"(long)(Fp->tellg()) " << (long)(Fp->tellg()) // in Debug mode
                 << std::hex << " 0x(" <<(long)(Fp->tellg()) <<  ")" << std::endl;
 
-
    // if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max) // Once per DocEntry   
       if ( !delim_mode ) // 'and then' doesn't exist in C++ :-(
          if ( ((long)(Fp->tellg())-offset) >= l_max) // Once per DocEntry, when no delim mode
@@ -2255,22 +2254,6 @@ DocEntry *Document::ReadNextDocEntry()
 
    VRKey vr = FindDocEntryVR();
    VRKey realVR = vr;
- /*  
-   std::string vr, realVR;
-   if (group == 0xfffe && (elem == 0xe000 || elem == 0xe00d || elem == 0xe0dd))
-   {
-    // DICOM PS 3.6-2009, page 117 states:
-    // The VR for Data Elements, Item (FFFE,E000), Item Delimitation
-    // Item (FFFE,E00D), and Sequence Delimitation Item (FFFE,E0DD)
-    // do not exist. See PS 3.5 for explanation.
-       vr = GDCM_UNKNOWN;
-       realVR = GDCM_UNKNOWN;   
-   }
-   else
-   {
-      vr = FindDocEntryVR();
-      realVR = vr;
-   }
 
    if ( vr == GDCM_VRUNKNOWN )
    {
@@ -2282,7 +2265,7 @@ DocEntry *Document::ReadNextDocEntry()
       {
          realVR = "UL";
       }
-*/
+
       // Was commented out in order not to generate 'Shadow Groups' where some 
       // Data Elements are Explicit VR and some other ones Implicit VR
       // -> Better we fix the problem at Write time