X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.h;h=2109cb508936d5a09cfecb178d038226e3dd37f4;hb=9cd51041e87ba178719523a35ef7ad823924cbf6;hp=36777fe68c9660f93e95b349e57aad16ad639099;hpb=ef8ed3af8c91289da3f6a6e64da7aafda69b8b62;p=gdcm.git

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 36777fe6..2109cb50 100644
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.h,v $
   Language:  C++
-  Date:      $Date: 2005/03/11 11:12:13 $
-  Version:   $Revision: 1.105 $
+  Date:      $Date: 2005/07/19 15:19:26 $
+  Version:   $Revision: 1.110 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,6 +19,7 @@
 #ifndef GDCMFILE_H
 #define GDCMFILE_H
 
+#include "gdcmDebug.h"
 #include "gdcmDocument.h"
 
 namespace gdcm 
@@ -96,9 +97,12 @@ class GDCM_EXPORT File : public Document
 {
 public:
    File();
-   File( std::string const &filename );
+   GDCM_LEGACY(File( std::string const &filename ));
    ~File();
 
+   // Loading
+   GDCM_LEGACY(bool Load( std::string const &filename ));
+   bool Load(); 
    // Standard values and informations contained in the header
    bool IsReadable();
 
@@ -180,12 +184,13 @@ protected:
    /// NumPixel to provide a unique access facility. 
    uint16_t NumPixel;
    /// \brief In some cases (e.g. for some ACR-NEMA images) the header entry for
-   /// the group of pixels is *not* found at 0x7fe0. In order to
-   /// make things easier the parser shall store the proper value in
-   /// GrPixel to provide a unique access facility.
+   /// the group of pixels is *not* found at 0x7fe0. 
+   /// In order to make things easier the parser shall store the proper value
+   /// in GrPixel to provide a unique access facility.
    uint16_t GrPixel;
 
 private:
+   bool DoTheLoadingJob();
    void ComputeRLEInfo();
    void ComputeJPEGFragmentInfo();
    bool     ReadTag(uint16_t, uint16_t);