X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmRLEFramesInfo.h;h=9ea93c4434a21d1b15d9cd9d2aea4858fa44a579;hb=56ad78cdf3b5de32f0a94a38cd32ddc9f403ffc3;hp=3bc1058ad711ca44975f04ca42808ee040c3c37c;hpb=64f79e8efbfae49231d1f469aa4fcc4acf0da70c;p=gdcm.git

diff --git a/src/gdcmRLEFramesInfo.h b/src/gdcmRLEFramesInfo.h
index 3bc1058a..9ea93c44 100644
--- a/src/gdcmRLEFramesInfo.h
+++ b/src/gdcmRLEFramesInfo.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLEFramesInfo.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/06 09:58:08 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2007/09/17 12:16:01 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,34 +17,53 @@
 =========================================================================*/
 
 
-#ifndef GDCMRLEFRAMESINFO_H
-#define GDCMRLEFRAMESINFO_H
+#ifndef _GDCMRLEFRAMESINFO_H_
+#define _GDCMRLEFRAMESINFO_H_
 
 #include "gdcmRLEFrame.h"
+
 #include <list>
 
+namespace GDCM_NAME_SPACE 
+{
 /**
  * \brief Utility class for gathering the informations of the collection
- *        of RLE frame[s] (see \ref gdcmRLEFrame)  when handling
- *        "Encapsulated RLE Compressed Images" (see PS-3.3 annex G). 
+ *        of RLE frame[s] (see  RLEFrame)  when handling
+ *        "Encapsulated RLE Compressed Images" (see PS 3.5-2003 annex G). 
  *        Note: a classical image can be considered as the degenerated case
  *              of a multiframe image. In this case the collection is limited
  *              to a single individual frame.
- *        The informations on each frame are obtained during the parsing
- *        of a gdcmDocument (refer to \ref gdcmDocument::Parse7FE0() ).
+ *        The informations on each frame are obtained during the pixel parsing
+ *        of a gdcm::File (refer to
+ *           File::ComputeRLEInfo() ).
  *        They shall be used when (if necessary) decoding the frames.
  *
- *        This class is simply a stl list<> of \ref gdcmRLEFrame.
+ *        This class is simply a stl list<> of RLEFrame.
  */
-class GDCM_EXPORT gdcmRLEFramesInfo
+class GDCM_EXPORT RLEFramesInfo
 {
-   typedef std::list< gdcmRLEFrame* > RLEFrameList;
-friend class gdcmDocument;
-friend class gdcmFile;
+friend class PixelReadConvert;
+friend class File;
+
+private:
+   ~RLEFramesInfo();
+   void Print( std::ostream &os = std::cout, std::string indent = "" );
+   bool DecompressRLEFile( std::ifstream *fp, uint8_t *subRaw, int xSize, 
+                           int ySize, int zSize, int tSize, int bitsAllocated );
+   bool ConvertRLE16BitsFromRLE8Bits( uint8_t *subRaw, int xSize, int ySize,
+                                      int tSize, int numberOfFrames);
+
+   void AddFrame(RLEFrame *frame);
+
+   RLEFrame *GetFirstFrame();
+   RLEFrame *GetNextFrame();
+
+   typedef std::list<RLEFrame *> RLEFrameList;
+
    RLEFrameList Frames;
-public:
-   ~gdcmRLEFramesInfo();
+   RLEFrameList::iterator ItFrames;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif