Reverse order sorting now works, even with user supplied function.

[gdcm.git] / src / gdcmRLEFrame.h

diff --git a/src/gdcmRLEFrame.h b/src/gdcmRLEFrame.h
index 735ffffe749c6eab5c55c7088075240b107f7c35..0d5dd3e975d4c99e97509d86c6b54967c26e2def 100644 (file)
--- a/src/gdcmRLEFrame.h
+++ b/src/gdcmRLEFrame.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLEFrame.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 10:21:54 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2005/02/01 18:37:31 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,7 +21,9 @@
 #define GDCMRLEFRAME_H
 
 #include "gdcmCommon.h"
+
 #include <iostream>
+#include <fstream>
 
 namespace gdcm 
 {
@@ -43,15 +45,26 @@ namespace gdcm
  */
 class GDCM_EXPORT RLEFrame
 {
-friend class Document;
-friend class PixelReadConvert;
-   unsigned int NumberFragments;
-   long    Offset[15];
-   long    Length[15];
 public:
-   RLEFrame() { NumberFragments = 0; }
-   void Print( std::string indent = "", std::ostream &os = std::cout );
-   
+   RLEFrame() { NumberOfFragments = 0; }
+   void Print( std::ostream &os = std::cout, std::string indent = "" );
+
+   void SetNumberOfFragments(unsigned int number) { NumberOfFragments = number; };   
+   unsigned int GetNumberOfFragments() { return NumberOfFragments; };
+   void SetOffset(unsigned int id, long offset);
+   long GetOffset(unsigned int id);
+   void SetLength(unsigned int id, long length);
+   long GetLength(unsigned int id);
+
+   uint8_t *ReadAndDecompressRLEFrame( uint8_t *subRaw,long rawSegmentSize,
+                                       std::ifstream *fp );
+   bool ReadAndDecompressRLEFragment( uint8_t *subRaw, long fragmentSize,
+                                      long rawSegmentSize, std::ifstream *fp );
+
+private:
+   unsigned int NumberOfFragments;
+   long Offset[15];
+   long Length[15];
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------