X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDocument.cxx;h=d89207dd94097aea20b18bc77ec6e7a595b783cf;hb=7059f7f1ad9d1466d7b752a40cfeb95ba81aa3d8;hp=c2ea01aa8c0aee230569c22843b0a20d68ad3b49;hpb=a462ce9f1af0894cd930ab04f2e65cd80dfa7084;p=gdcm.git

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index c2ea01aa..d89207dd 100644
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/08 15:03:59 $
-  Version:   $Revision: 1.168 $
+  Date:      $Date: 2005/01/10 17:17:52 $
+  Version:   $Revision: 1.171 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -47,7 +47,7 @@ namespace gdcm
 static const char *TransferSyntaxStrings[] =  {
   // Implicit VR Little Endian
   "1.2.840.10008.1.2",
-  // Implicit VR Big Endian DLX G.E?
+  // Implicit VR Big Endian DLX (G.E Private)
   "1.2.840.113619.5.2",
   // Explicit VR Little Endian
   "1.2.840.10008.1.2.1",
@@ -449,6 +449,9 @@ std::ifstream *Document::OpenFile()
        zero == 0x0005 || zero == 0x0500 || zero == 0x0006 || zero == 0x0600 ||
        zero == 0x0007 || zero == 0x0700 || zero == 0x0008 || zero == 0x0800 )
    {
+      std::string msg 
+         = Util::Format("ACR/DICOM with no preamble: (%04x)\n", zero);
+      gdcmVerboseMacro( msg.c_str() );
       return Fp;
    }
  
@@ -1903,14 +1906,12 @@ void Document::SkipDocEntry(DocEntry *entry)
 /**
  * \brief   Skips to the begining of the next Header Entry 
  * \warning NOT end user intended method !
- * @param   offset start of skipping
- * @param   readLgth length to skip
-
+ * @param   currentDocEntry entry to skip
  */
-void Document::SkipToNextDocEntry(DocEntry *newDocEntry) 
+void Document::SkipToNextDocEntry(DocEntry *currentDocEntry) 
 {
-   Fp->seekg((long)(newDocEntry->GetOffset()),     std::ios::beg);
-   Fp->seekg( (long)(newDocEntry->GetReadLength()),std::ios::cur);
+   Fp->seekg((long)(currentDocEntry->GetOffset()),     std::ios::beg);
+   Fp->seekg( (long)(currentDocEntry->GetReadLength()),std::ios::cur);
 }
 
 /**
@@ -1918,7 +1919,7 @@ void Document::SkipToNextDocEntry(DocEntry *newDocEntry)
  *          the parser went Jabberwocky) one can hope improving things by
  *          applying some heuristics.
  * @param   entry entry to check
- * @param   foundLength fist assumption about length    
+ * @param   foundLength first assumption about length    
  */
 void Document::FixDocEntryFoundLength(DocEntry *entry,
                                       uint32_t foundLength)
@@ -1994,7 +1995,7 @@ void Document::FixDocEntryFoundLength(DocEntry *entry,
  */
 bool Document::IsDocEntryAnInteger(DocEntry *entry)
 {
-   uint16_t element = entry->GetElement();
+   uint16_t elem    = entry->GetElement();
    uint16_t group   = entry->GetGroup();
    const std::string &vr  = entry->GetVR();
    uint32_t length  = entry->GetLength();
@@ -2002,7 +2003,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.
-   if ( element == 0 )  // This is the group length of the group
+   if ( elem == 0 )  // This is the group length of the group
    {  
       if ( length == 4 )
       {
@@ -2019,7 +2020,7 @@ bool Document::IsDocEntryAnInteger(DocEntry *entry)
          // message and proceed on parsing (while crossing fingers).
          long filePosition = Fp->tellg();
          gdcmVerboseMacro( "Erroneous Group Length element length  on : (" 
-           << std::hex << group << " , " << element 
+           << std::hex << group << " , " << elem
            << ") -before- position x(" << filePosition << ")"
            << "lgt : " << length );
       }
@@ -2057,8 +2058,8 @@ uint32_t Document::FindDocEntryLengthOBOrOW()
       }
       catch ( FormatError )
       {
-         throw FormatError("Document::FindDocEntryLengthOBOrOW()",
-                           " group or element not present.");
+         throw FormatError("Unexpected end of file encountered during ",
+                           "Document::FindDocEntryLengthOBOrOW()");
       }
 
       // We have to decount the group and element we just read
@@ -2066,7 +2067,11 @@ uint32_t Document::FindDocEntryLengthOBOrOW()
      
       if ( group != 0xfffe || ( ( elem != 0xe0dd ) && ( elem != 0xe000 ) ) )
       {
-         gdcmVerboseMacro( "Neither an Item tag nor a Sequence delimiter tag."); 
+         long filePosition = Fp->tellg();
+         gdcmVerboseMacro( "Neither an Item tag nor a Sequence delimiter tag on :" 
+           << std::hex << group << " , " << elem 
+           << ") -before- position x(" << filePosition << ")" );
+  
          Fp->seekg(positionOnEntry, std::ios::beg);
          throw FormatUnexpected( "Neither an Item tag nor a Sequence delimiter tag.");
       }
@@ -2437,7 +2442,7 @@ void Document::HandleBrokenEndian(uint16_t group, uint16_t elem)
      group = 0xfffe;
      elem = 0xe000;
    } 
-   else if ((group == 0xfffe) && (elem == 0xe00d) && reversedEndian) 
+   else if (group == 0xfffe && elem == 0xe00d && reversedEndian) 
    {
      // end of reversed endian group
      reversedEndian--;
@@ -2579,7 +2584,7 @@ bool Document::ReadTag(uint16_t testGroup, uint16_t testElement)
        << std::hex << testGroup << "," << testElement << ")" << std::endl
        << "   but instead we encountered tag ("
        << std::hex << itemTagGroup << "," << itemTagElement << ")"
-       << std::endl
+       << std::dec
        << "  at address: " << (unsigned int)currentPosition );
       Fp->seekg(positionOnEntry, std::ios::beg);