X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=ab2782a532b178ec3a3bdb4354b352fed0ecccb8;hb=6278320cc85da00d2d56ffbf07806e84966892c3;hp=6f2fbe711055e4292f0a8d4e0ca5fe8850f7a61e;hpb=2ae8698d36d498b85f9766b5bc54f42d19d81193;p=gdcm.git

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 6f2fbe71..ab2782a5 100644
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2007/06/18 11:10:17 $
-  Version:   $Revision: 1.145 $
+  Date:      $Date: 2008/09/15 15:49:22 $
+  Version:   $Revision: 1.154 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
  
 =========================================================================*/
 
-#ifndef GDCMDOCUMENT_H
-#define GDCMDOCUMENT_H
+#ifndef _GDCMDOCUMENT_H_
+#define _GDCMDOCUMENT_H_
 
 #include "gdcmVR.h"
 #include "gdcmDict.h"
@@ -37,7 +37,7 @@ class Dict;
 
 //-----------------------------------------------------------------------------
 /**
- * \brief Derived by both gdcm::File and gdcm::DicomDir
+ * \brief Derived by both GDCM_NAME_SPACE::File and GDCM_NAME_SPACE::DicomDir
  */
 class GDCM_EXPORT Document : public ElementSet
 {
@@ -59,7 +59,7 @@ public:
    bool SetShaDict(Dict *dict);
    bool SetShaDict(DictKey const &dictName);
 
-// Informations contained in the gdcm::Document
+// Informations contained in the GDCM_NAME_SPACE::Document
    bool IsParsable();
    virtual bool IsReadable();
    bool IsDicomV3();
@@ -70,20 +70,20 @@ public:
    std::string GetTransferSyntaxName();
 
 // Swap code
-   /// 'Swap code' accessor (see \ref SwapCode )
+   /// 'Swap code' accessor (see  SwapCode )
    int GetSwapCode() { return SwapCode; }
    
 // File I/O
-   /// Accessor to \ref Filename
+   /// Accessor to  Filename
    const std::string &GetFileName() const { return Filename; }
-   /// Accessor to \ref Filename
+   /// Accessor to  Filename
    virtual void SetFileName(std::string const &fileName) 
                    { if (Filename != fileName)
                         Filename = fileName, IsDocumentModified = true; }
 
    std::ifstream *OpenFile();
    bool CloseFile();
-   void WriteContent( std::ofstream *fp, FileType type );
+   void WriteContent( std::ofstream *fp, FileType type, bool insideMetaElements, bool insideSequence );
 
 // Data entries
    virtual void LoadEntryBinArea(uint16_t group, uint16_t elem);
@@ -91,27 +91,27 @@ public:
 
    void SetMaxSizeLoadEntry(long);
    void AddForceLoadElement(uint16_t group, uint16_t elem);
- 
+
 // Ordering of Documents
    bool operator<(Document &document);
 
 /**
- * \brief Sets the LoadMode as a boolean string. 
+ * \brief Sets the LoadMode as a boolean string.
  *        LD_NOSEQ, LD_NOSHADOW, LD_NOSHADOWSEQ
  ... (nothing more, right now)
  *        WARNING : before using NO_SHADOW, be sure *all* your files
- *        contain accurate values in the 0x0000 element (if any) 
+ *        contain accurate values in the 0x0000 element (if any)
  *        of *each* Shadow Group. The parser will fail if the size is wrong !
- * @param   mode Load mode to be used    
+ * @param   mode Load mode to be used
  */
-   void SetLoadMode (int mode) { if (LoadMode != mode) 
+   void SetLoadMode (int mode) { if (LoadMode != mode)
                                      LoadMode=mode, IsDocumentModified = true; }
 
 protected:
 // Methods
-   // Constructor and destructor are protected to forbid end user 
-   // to instanciate from this class Document (only gdcm::File and
-   // gdcm::DicomDir are meaningfull).
+   // Constructor and destructor are protected to forbid end user
+   // to instanciate from this class Document (only GDCM_NAME_SPACE::File and
+   // GDCM_NAME_SPACE::DicomDir are meaningfull).
    Document();
    virtual ~Document();
 
@@ -121,9 +121,9 @@ protected:
       
    uint16_t ReadInt16() throw ( FormatError );
    uint32_t ReadInt32() throw ( FormatError );
-   
+
    /// \brief skips bytes inside the source file
-   void     SkipBytes(uint32_t nBytes) { Fp->seekg((long)nBytes, std::ios::cur);} 
+   void     SkipBytes(uint32_t nBytes) { Fp->seekg((long)nBytes, std::ios::cur);}
    int ComputeGroup0002Length( );
 
 // Variables
@@ -174,12 +174,12 @@ protected:
    ///        Probabely, some more to add
    int LoadMode;
    
-   /// \brief Whether the gdcm::Document is already parsed/loaded :
-   /// False from the creation of the gdcm::Document untill 
-   ///   gdcm::Document:Load()
+   /// \brief Whether the GDCM_NAME_SPACE::Document is already parsed/loaded :
+   /// False from the creation of the GDCM_NAME_SPACE::Document untill 
+   ///   GDCM_NAME_SPACE::Document:Load()
    bool IsDocumentAlreadyLoaded; // FIXME : probabely useless now
 
-   /// Whether the gdcm::Document was modified since the last Load()
+   /// Whether the GDCM_NAME_SPACE::Document was modified since the last Load()
    bool IsDocumentModified;
 
 private:
@@ -222,11 +222,10 @@ private:
    DocEntry *ReadNextDocEntry();
    uint16_t GetInt16();
    uint32_t GetInt32();
-   
+
    void HandleBrokenEndian  (uint16_t &group, uint16_t &elem);
    void HandleOutOfGroup0002(uint16_t &group, uint16_t &elem);
-   DocEntry *Backtrack(DocEntry *docEntry);
-
+   DocEntry *Backtrack(DocEntry *docEntry, DocEntrySet *set);
 
 // Variables
 protected:
@@ -266,6 +265,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