When 'Pixel Aspect Ratio' exists, don't add a default 'Pixel Spacing'

[gdcm.git] / src / gdcmRLEFramesInfo.h

diff --git a/src/gdcmRLEFramesInfo.h b/src/gdcmRLEFramesInfo.h
index d5fad91e9defccf9c077a28987379f8760739d59..dfabdf4bffc554a0f96fd88837f8b2582e06279f 100644 (file)
--- 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 04:15:33 $
-  Version:   $Revision: 1.15 $
+  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,16 +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 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;