X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=31a030cee597607cd01b573da91645edfece10f5;hb=e7768bbebdc9a5972e396d71a3e848f5674ee378;hp=243f2f45249d07f038a2528677c3694cc107249c;hpb=f07febbce9f70fd0faee0f3ce3df674c1e7f8a13;p=gdcm.git

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 243f2f45..31a030ce 100644
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2006/07/10 09:41:46 $
-  Version:   $Revision: 1.142 $
+  Date:      $Date: 2007/10/08 15:20:17 $
+  Version:   $Revision: 1.148 $
  
   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"
@@ -30,7 +30,7 @@
 #include <list>
 #include <fstream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 class SeqEntry;
 class Dict;
@@ -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);
@@ -201,7 +201,7 @@ private:
    
    // Read
    void ParseDES(DocEntrySet *set, long offset, long l_max, bool delim_mode);
-   void ParseSQ (SeqEntry *seq,    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);
    void FindDocEntryLength   (DocEntry *e) throw ( FormatError );
@@ -261,6 +261,11 @@ private:
    char *PtrBegBuffer;
    /// \brief to avoid time consuming ftellg
    size_t CurrentOffsetPosition;
+   /// \brief to indicate if last supposed to be UN DataElement is not
+   ///        (according to a private Dicom dictionary) 
+   bool changeFromUN;
+   /// \brief whether an unexpected EOF was encountered
+   bool UnexpectedEOF;
 };
 
 } // end namespace gdcm