X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=243f2f45249d07f038a2528677c3694cc107249c;hb=c5cbf0eb33a0e937f5db6b95ce9570f1ec8acd1c;hp=9dbd9af164d9841e3ebadb664881729a2e92826b;hpb=79d1ce76dfcb136e8b77aaeac859ba59973e7ae4;p=gdcm.git

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 9dbd9af1..243f2f45 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/09 10:48:05 $
-  Version:   $Revision: 1.139 $
+  Date:      $Date: 2006/07/10 09:41:46 $
+  Version:   $Revision: 1.142 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -48,8 +48,9 @@ public:
 
 // Loading
    //Deprecated : use SetFileName() + Load()
-   //GDCM_LEGACY(  virtual bool Load( std::string const &filename )  ); 
-   //virtual bool Load( std::string const &filename );
+//#ifndef GDCM_LEGACY_REMOVE 
+//   virtual bool Load( std::string const &filename ); 
+//#endif
    virtual bool Load( ); 
 
 // Dictionaries
@@ -88,7 +89,7 @@ public:
    virtual void LoadEntryBinArea(uint16_t group, uint16_t elem);
    virtual void LoadEntryBinArea(DataEntry *entry);
 
-   //void LoadDocEntrySafe(DocEntry *entry);
+   void SetMaxSizeLoadEntry(long);
    void AddForceLoadElement(uint16_t group, uint16_t elem);
  
 // Ordering of Documents
@@ -184,9 +185,10 @@ protected:
 private:
 // Methods
    void Initialize();
-   bool DoTheLoadingDocumentJob(); 
+   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);
@@ -215,15 +217,17 @@ private:
 
    bool CheckSwap();
    void SwitchByteSwapCode();
-   void SetMaxSizeLoadEntry(long);
 
    // 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,12 @@ 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;
 };
 
 } // end namespace gdcm