X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmFile.h;h=2109cb508936d5a09cfecb178d038226e3dd37f4;hb=ac954771575ed03dde66e0ebb7349e32c6312379;hp=b8264c05eb90c245c78914807ec2bca9161289c5;hpb=088100ec11c9814549610307c848af8c14e81ba6;p=gdcm.git diff --git a/src/gdcmFile.h b/src/gdcmFile.h index b8264c05..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/06/10 14:05:38 $ - Version: $Revision: 1.107 $ + 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,12 +97,12 @@ class GDCM_EXPORT File : public Document { public: File(); - File( std::string const &filename ); + GDCM_LEGACY(File( std::string const &filename )); ~File(); // Loading - bool Load( std::string const &filename ); - + GDCM_LEGACY(bool Load( std::string const &filename )); + bool Load(); // Standard values and informations contained in the header bool IsReadable(); @@ -189,6 +190,7 @@ protected: uint16_t GrPixel; private: + bool DoTheLoadingJob(); void ComputeRLEInfo(); void ComputeJPEGFragmentInfo(); bool ReadTag(uint16_t, uint16_t);