X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=874769a122b11f9465fa85df633459f085406d46;hb=0bcc188c6d5185375f809253e8b9b97c856d2eac;hp=e3d0d74a937a24894642d3d832dd1da4a6024438;hpb=fe3b2ed8c460fdf307cccbd8e4f885b8bbb35351;p=gdcm.git diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index e3d0d74a..874769a1 100644 --- a/src/gdcmDocument.h +++ b/src/gdcmDocument.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.h,v $ Language: C++ - Date: $Date: 2007/06/15 13:16:56 $ - Version: $Revision: 1.144 $ + Date: $Date: 2007/09/17 12:16:02 $ + Version: $Revision: 1.147 $ 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" @@ -70,13 +70,13 @@ 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; } @@ -201,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 ); @@ -264,6 +264,8 @@ private: /// \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