X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=28996c2817506e42b261b940cc7d8e796ca54974;hb=81b83abc1f19db44870ea35907c5f6a102ba5c64;hp=3f5e3df0b9aa56061af5777187169b3baffdc1b0;hpb=96775cd7d34ec152fbf1430634bb338f524ee212;p=gdcm.git diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index 3f5e3df0..28996c28 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/07 12:37:19 $ - Version: $Revision: 1.138 $ + Date: $Date: 2006/05/30 08:10:19 $ + Version: $Revision: 1.141 $ 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 @@ -84,11 +85,11 @@ public: bool CloseFile(); void WriteContent( std::ofstream *fp, FileType type ); -// Content entries +// Data entries 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,7 +185,7 @@ protected: private: // Methods void Initialize(); - bool DoTheLoadingDocumentJob(); + bool DoTheLoadingDocumentJob(); // System access (meaning endian related !?) uint16_t SwapShort(uint16_t); @@ -215,7 +216,6 @@ private: bool CheckSwap(); void SwitchByteSwapCode(); - void SetMaxSizeLoadEntry(long); // DocEntry related utilities DocEntry *ReadNextDocEntry();