X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmRLEFramesInfo.h;h=dfabdf4bffc554a0f96fd88837f8b2582e06279f;hb=4ae5f29bc5a2fa48c38fe43d331e5099aad4ed0f;hp=27c42287f955522e7f278f6f929a9a37a6a6b41e;hpb=bd2c6b9f9fa4b815153b200081de0450429a882e;p=gdcm.git

diff --git a/src/gdcmRLEFramesInfo.h b/src/gdcmRLEFramesInfo.h
index 27c42287..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/31 05:24:22 $
-  Version:   $Revision: 1.16 $
+  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
@@ -42,23 +42,22 @@ namespace gdcm
  */
 class GDCM_EXPORT RLEFramesInfo
 {
-public:
+friend class PixelReadConvert;
+friend class File;
+
+private:
    ~RLEFramesInfo();
    void Print( std::ostream &os = std::cout, std::string indent = "" );
-   bool ReadAndDecompressRLEFile( std::ifstream *fp, uint8_t *subRaw, int xSize, int ySize, int zSize, int bitsAllocated );
-   bool ReadAndDecompressRLEFragment(
-                  uint8_t *subDecompressed,
-                  long fragmentSize,
-                  long decompressedSegmentSize,
-                  std::ifstream *fp );
-   bool DecompressRLE16BitsFromRLE8Bits( uint8_t* subRaw, int xSize, int ySize, int NumberOfFrames );
+   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();
 
-private:
    typedef std::list<RLEFrame *> RLEFrameList;
 
    RLEFrameList Frames;