- src/gdcmDocument.[cxx|h] ::ParseDES and ::ParseSQ no longer bother

[gdcm.git] / src / gdcmDocument.h

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index abbeee4c77ace14dde3ab0971cac4fc7593b4a4d..57d62dc91a28b0bf4c8381003aa537c76acc0183 100644 (file)
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2004/09/24 01:14:31 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2004/10/06 13:12:42 $
+  Version:   $Revision: 1.46 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
  
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -25,6 +25,7 @@
 #include "gdcmException.h"
 #include "gdcmDictSet.h"
 #include "gdcmDocEntry.h"
+#include "gdcmRLEFramesInfo.h"
 
 class gdcmValEntry;
 class gdcmBinEntry;
@@ -91,8 +92,8 @@ protected:
    ///       \ref gdcmDocument::SetMaxSizePrintEntry()
    static const unsigned int MAX_SIZE_PRINT_ELEMENT_VALUE;
 
-   /// Will be set 1 if user asks to 'go inside' the 'sequences' (VR = "SQ")
-   int EnableSequences;
+   /// Store the RLE frames info obtained during parsing of pixels.
+   gdcmRLEFramesInfo RLEInfo;
 
    /// \brief Amount of printed details for each Header Entry (Dicom Element):
    /// 0 : stands for the least detail level.
@@ -123,6 +124,7 @@ public:
    bool IsRLELossLessTransferSyntax();
    bool IsJPEGLossless();
    bool IsJPEG2000();
+   bool IsEncapsulateTransferSyntax();
    bool IsDicomV3();
 
    FileType GetFileType();
@@ -163,7 +165,7 @@ protected:
    gdcmDocument( std::string const & filename );
    virtual ~gdcmDocument();
    
-   void Parse7FE0 ();   
+   void Parse7FE0();
    // Entry
    bool CheckIfEntryExistByNumber(uint16_t group, uint16_t elem );
 public:
@@ -201,9 +203,9 @@ public:
 
 private:
    // Read
-   long ParseDES(gdcmDocEntrySet *set,long offset, long l_max, bool delim_mode);
-   long ParseSQ (gdcmSeqEntry *seq,   long offset, long l_max, bool delim_mode); 
-   
+   void ParseDES(gdcmDocEntrySet *set,long offset, long l_max, bool delim_mode);
+   void ParseSQ (gdcmSeqEntry *seq,   long offset, long l_max, bool delim_mode);
+
    void LoadDocEntry      (gdcmDocEntry *);
    void FindDocEntryLength(gdcmDocEntry *) throw ( gdcmFormatError );
    void FindDocEntryVR    (gdcmDocEntry *);