X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDocument.h;h=6f2fbe711055e4292f0a8d4e0ca5fe8850f7a61e;hb=41fcaa925770000d87082af846146bf7a8d4438d;hp=243f2f45249d07f038a2528677c3694cc107249c;hpb=f07febbce9f70fd0faee0f3ce3df674c1e7f8a13;p=gdcm.git diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index 243f2f45..6f2fbe71 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/07/10 09:41:46 $ - Version: $Revision: 1.142 $ + Date: $Date: 2007/06/18 11:10:17 $ + Version: $Revision: 1.145 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -30,7 +30,7 @@ #include #include -namespace gdcm +namespace GDCM_NAME_SPACE { class SeqEntry; class Dict; @@ -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 ); @@ -261,6 +261,11 @@ private: char *PtrBegBuffer; /// \brief to avoid time consuming ftellg size_t CurrentOffsetPosition; + /// \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