Fix error message

[gdcm.git] / src / gdcmDocument.h

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index fb55b8a640695a201b8761c118a7219ce004322e..e11eb873e6bbc990a20f3fee56b0d189a7b7877f 100644 (file)
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2007/12/03 11:47:40 $
-  Version:   $Revision: 1.149 $
+  Date:      $Date: 2008/01/04 13:32:01 $
+  Version:   $Revision: 1.151 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -200,7 +200,7 @@ private:
    uint32_t UnswapLong(uint32_t a) { return SwapLong(a);}
    
    // Read
-   void ParseDES(DocEntrySet *set, long offset, long l_max, bool delim_mode);
+   bool ParseDES(DocEntrySet *set, long offset, long l_max, bool delim_mode);
    bool ParseSQ (SeqEntry *seq,    long offset, long l_max, bool delim_mode);
 
    void LoadDocEntry         (DocEntry *e, bool forceLoad = false);
@@ -225,9 +225,8 @@ private:
 
    void HandleBrokenEndian  (uint16_t &group, uint16_t &elem);
    void HandleOutOfGroup0002(uint16_t &group, uint16_t &elem);
-   DocEntry *Backtrack(DocEntry *docEntry);
-
-// Variables
+   DocEntry  *Backtrack(DocEntry *docEntry, DocEntrySet *set);
+   DataEntry *BacktrackSQtoOB(SeqEntry *docEntry, DocEntrySet *set);
 protected:
    /// value of the ??? for any progress bar
    float Progress;
@@ -265,6 +264,8 @@ private:
    bool changeFromUN;
    /// \brief whether an unexpected EOF was encountered
    bool UnexpectedEOF;
+   /// \brief to avoid infinite loop when illegal UN stands for OB
+   size_t OffsetOfPreviousParseDES;
 };
 
 } // end namespace gdcm