X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=31a030cee597607cd01b573da91645edfece10f5;hb=add6c88b334e9cf4ddb0ae1849f1380f9844f99c;hp=841bd685b15d8968bd0a1e9423d30054afcf551d;hpb=906464b1c71b1b623f8202a693e75a358a5bd965;p=gdcm.git

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 841bd685..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/02/16 20:06:14 $
-  Version:   $Revision: 1.140 $
+  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;
@@ -48,9 +48,9 @@ public:
 
 // Loading
    //Deprecated : use SetFileName() + Load()
-#ifndef GDCM_LEGACY_REMOVE 
-   virtual bool Load( std::string const &filename ); 
-#endif
+//#ifndef GDCM_LEGACY_REMOVE 
+//   virtual bool Load( std::string const &filename ); 
+//#endif
    virtual bool Load( ); 
 
 // Dictionaries
@@ -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);
@@ -188,6 +188,7 @@ private:
    bool DoTheLoadingDocumentJob();
      
       // System access (meaning endian related !?)
+   void ReadBegBuffer(size_t l) throw ( FormatError );
    uint16_t SwapShort(uint16_t);
    uint32_t SwapLong(uint32_t);
    double SwapDouble(double);
@@ -200,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 );
@@ -219,11 +220,14 @@ private:
 
    // DocEntry related utilities
    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);
 
+
 // Variables
 protected:
    /// value of the ??? for any progress bar
@@ -251,6 +255,17 @@ protected:
 //  void BuildFlatHashTableRecurse( TagDocEntryHT &builtHT,
 //                                  DocEntrySet *set );
 
+private:
+   /// \brief buffer to avoid some freads
+   char BegBuffer[8];
+   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