Comments

[gdcm.git] / src / gdcmDocument.cxx

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 012e51cbab74fbccf6e4a4c44e045700bb2a7c06..377d95a988fa9afaf46e4c638fbd4481b89ff126 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: 2005/10/27 18:12:40 $
-  Version:   $Revision: 1.318 $
+  Date:      $Date: 2005/11/03 14:21:50 $
+  Version:   $Revision: 1.321 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -187,7 +187,7 @@ bool Document::DoTheLoadingDocumentJob(  )
       /// In order to fix things "Quick and Dirty" the dictionary was
       /// altered on PURPOSE but now contains a WRONG value.
       /// In order to fix things and restore the dictionary to its
-      /// correct value, one needs to decided of the semantics by deciding
+      /// correct value, one needs to decide of the semantics by deciding
       /// whether the following tags are either :
       /// - multivaluated US, and hence loaded as ValEntry, but afterwards
       ///   also used as BinEntry, which requires the proper conversion,
@@ -762,14 +762,13 @@ void Document::LoadEntryBinArea(DataEntry *entry)
                         Global::GetVR()->GetAtomicElementLength(entry->GetVR());
 
 // FIXME : trouble expected if we read an ... OW Entry (LUT, etc ..)
-   if( entry->GetVR() == "OW" )
-      vrLgth = 1;
+//   if( entry->GetVR() == "OW" )
+//      vrLgth = 1;
 
    switch(vrLgth)
    {
       case 1:
       {
-         gdcmDebugMacro( "Atomic lgt = 1 ; NO swap at reading");
          break;
       }     
       case 2:
@@ -940,7 +939,7 @@ void Document::SkipBytes(uint32_t nBytes)
 }
 
 /**
- * \brief   Re-computes the length of a ACR-NEMA/Dicom group from a DcmHeader
+ * \brief   Re-computes the length of the Dicom group 0002.
  */
 int Document::ComputeGroup0002Length( ) 
 {
@@ -964,11 +963,6 @@ int Document::ComputeGroup0002Length( )
          {
             vr = entry->GetVR();
 
-            // FIXME : group 0x0002 is *always* Explicit VR!
-            // --> Except for Implicit VR Transfer Syntax (GE Private) !!
-   
-            //if ( filetype == ExplicitVR )
-            //{
             //if ( (vr == "OB")||(vr == "OW")||(vr == "UT")||(vr == "SQ"))
             // (no SQ, OW, UT in group 0x0002;)
                if ( vr == "OB" ) 
@@ -976,7 +970,7 @@ int Document::ComputeGroup0002Length( )
                   // explicit VR AND (OB, OW, SQ, UT) : 4 more bytes
                   groupLength +=  4;
                }
-            //}
+ 
             groupLength += 2 + 2 + 4 + entry->GetLength();   
          }
       }