X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmRLEFramesInfo.h;h=dfabdf4bffc554a0f96fd88837f8b2582e06279f;hb=745e3abcf3563cd15ebb92316d6dd800d8199340;hp=a88a670ad4e5e639625e8ee0a880471fba693f82;hpb=016aa39f27667edc2756025e2630b09f229664fc;p=gdcm.git

diff --git a/src/gdcmRLEFramesInfo.h b/src/gdcmRLEFramesInfo.h
index a88a670a..dfabdf4b 100644
--- a/src/gdcmRLEFramesInfo.h
+++ b/src/gdcmRLEFramesInfo.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLEFramesInfo.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/26 16:28:58 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.24 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,14 +17,14 @@
 =========================================================================*/
 
 
-#ifndef GDCMRLEFRAMESINFO_H
-#define GDCMRLEFRAMESINFO_H
+#ifndef _GDCMRLEFRAMESINFO_H_
+#define _GDCMRLEFRAMESINFO_H_
 
 #include "gdcmRLEFrame.h"
 
 #include <list>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 /**
  * \brief Utility class for gathering the informations of the collection
@@ -33,27 +33,35 @@ namespace gdcm
  *        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 Document (refer to
- *          \ref Document::ComputeRLEInfo() ).
+ *        The informations on each frame are obtained during the pixel parsing
+ *        of a gdcm::File (refer to
+ *          \ref File::ComputeRLEInfo() ).
  *        They shall be used when (if necessary) decoding the frames.
  *
  *        This class is simply a stl list<> of \ref RLEFrame.
  */
 class GDCM_EXPORT RLEFramesInfo
 {
-public:
+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);
 
-private:
+   RLEFrame *GetFirstFrame();
+   RLEFrame *GetNextFrame();
+
    typedef std::list<RLEFrame *> RLEFrameList;
 
    RLEFrameList Frames;
-
-   friend class PixelReadConvert;
+   RLEFrameList::iterator ItFrames;
 };
 } // end namespace gdcm