Most of the file headers have NO z spacing

[gdcm.git] / src / gdcmDocument.cxx

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 8534ae6d7d6c4c34da777367aa83a539f1a78e92..c2754559da0d9946c7ea82506abc8bcb0f8401ff 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: 2006/10/19 10:30:45 $
-  Version:   $Revision: 1.354 $
+  Date:      $Date: 2007/05/23 14:18:09 $
+  Version:   $Revision: 1.358 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -37,7 +37,7 @@
    #include <mem.h> // for memset
 #endif 
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 
@@ -244,7 +244,7 @@ bool Document::DoTheLoadingDocumentJob(  )
 
    // Force Loading some more elements if user asked to.
 
-   gdcm::DocEntry *d;
+   GDCM_NAME_SPACE::DocEntry *d;
    for (ListElements::iterator it = UserForceLoadList.begin();  
                                it != UserForceLoadList.end();
                              ++it)
@@ -581,8 +581,9 @@ double Document::SwapDouble(double a)
 // -----------------File I/O ---------------
 /**
  * \brief  Tries to open the file \ref Document::Filename and
- *         checks the preamble when existing.
- * @return The FILE pointer on success. 
+ *         checks the preamble when existing,
+ *         or if the file starts with an ACR-NEMA look-like element.
+ * @return The FILE pointer on success, 0 on failure. 
  */
 std::ifstream *Document::OpenFile()
 {
@@ -634,6 +635,7 @@ std::ifstream *Document::OpenFile()
       CloseFile();
       return 0;
    }
+   
    if ( memcmp(dicm, "DICM", 4) == 0 )
    {
       HasDCMPreamble = true;
@@ -1851,7 +1853,7 @@ bool Document::IsDocEntryAnInteger(DocEntry *entry)
 
    // When we have some semantics on the element we just read, and if we
    // a priori know we are dealing with an integer, then we shall be
-   // able to swap it's element value properly.
+   // able to swap its element value properly.
    if ( elem == 0 )  // This is the group length of the group
    {  
       if ( length == 4 )
@@ -1927,7 +1929,7 @@ bool Document::CheckSwap()
       // i.e. a total of  136 bytes.
       entCur = deb + 136;
      
-      // group 0x0002 *is always* Explicit VR Sometimes ,
+      // group 0x0002 *is always* Explicit VR Sometimes,
       // even if elem 0002,0010 (Transfer Syntax) tells us the file is
       // *Implicit* VR  (see former 'gdcmData/icone.dcm')
       
@@ -1950,6 +1952,8 @@ bool Document::CheckSwap()
                         << "Looks like a bugged Header!");
       }
       
+      // Here, we assume that the file IS kosher Dicom !
+      // (The meta elements - group 0x0002 - ARE little endian !)
       if ( net2host )
       {
          SwapCode = 4321;
@@ -2353,9 +2357,13 @@ void Document::HandleOutOfGroup0002(uint16_t &group, uint16_t &elem)
       //
       // --> Probabely normal, since we considered we never have 
       // to trust manufacturers.
-      // (we find very often 'Implicit VR' tag, 
+      // (we often find 'Implicit VR' tag, 
       // even when Transfer Syntax tells us it's Explicit ...
       
+       // NEVER trust the meta elements!
+       // (see what ezDICOM does ...)
+             
+      /*
       if ( s ==  TS::ExplicitVRBigEndian )
       {
          gdcmDebugMacro("Transfer Syntax Name = [" 
@@ -2364,7 +2372,20 @@ void Document::HandleOutOfGroup0002(uint16_t &group, uint16_t &elem)
          group = SwapShort(group);
          elem  = SwapShort(elem);
       }
-
+      */
+    //-- Broken ACR  may start with a Shadow Group --
+    // worse : some ACR-NEMA like files start 00028 group ?!? 
+    if ( !( (group >= 0x0001 && group <= 0x0008) || group == 0x0028 ) )
+    {
+       // We trust what we see.
+       SwitchByteSwapCode();
+       group = SwapShort(group);
+       elem  = SwapShort(elem); 
+       // not what we where told (by meta elements) !
+       gdcmDebugMacro("Transfer Syntax Name = ["       
+                       << GetTransferSyntaxName() << "]" );         
+    }
+      
       /// \todo  find a trick to warn user and stop processing
             
       if ( s == TS::DeflatedExplicitVRLittleEndian)