COMP: Snap, forgot this one...

[gdcm.git] / src / gdcmPixelReadConvert.h

diff --git a/src/gdcmPixelReadConvert.h b/src/gdcmPixelReadConvert.h
index 047d31939d215b3475fc4ffea9c5c1a1d9996931..07cc6e0ba4be92b24c4a0a307a9922e97c97c84b 100644 (file)
--- a/src/gdcmPixelReadConvert.h
+++ b/src/gdcmPixelReadConvert.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/31 03:22:26 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2005/05/30 01:30:39 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,9 +20,9 @@
 #ifndef GDCMPIXELREADCONVERT_H
 #define GDCMPIXELREADCONVERT_H
 
-#include "gdcmCommon.h"
 #include "gdcmBase.h"
 #include "gdcmException.h"
+#include <fstream>
 
 namespace gdcm
 {
@@ -40,18 +40,18 @@ public:
    PixelReadConvert();
    virtual ~PixelReadConvert();
 
-   //// Getter accessors:
-   uint8_t* GetRGB()     { return RGB; }
+   void Print( std::ostream &os = std::cout, std::string const &indent = "" );
+
+   // Getter accessors:
+   uint8_t *GetRGB()     { return RGB;     }
    size_t   GetRGBSize() { return RGBSize; }
-   uint8_t* GetRaw()     { return Raw; }
+   uint8_t *GetRaw()     { return Raw;     }
    size_t   GetRawSize() { return RawSize; }
-   uint8_t* GetLutRGBA() { return LutRGBA; }
+   uint8_t *GetLutRGBA() { return LutRGBA; }
 
-   //// Predicates:
+   // Predicates:
    bool IsRawRGB();
 
-   void Print( std::ostream &os = std::cout, std::string const & indent = "" );
-
 // In progress
    void GrabInformationsFromFile( File *file );
    bool ReadAndDecompressPixelData( std::ifstream *fp );
@@ -60,24 +60,17 @@ public:
 
 private:
    // Use the fp:
-   bool ReadAndDecompressRLEFragment(
-                  uint8_t *subDecompressed,
-                  long fragmentSize,
-                  long decompressedSegmentSize,
-                  std::ifstream *fp );
-   void ReadAndDecompress12BitsTo16Bits( std::ifstream *fp ) throw ( FormatError );
-   bool ReadAndDecompressRLEFile( std::ifstream *fp );
+   void ReadAndDecompress12BitsTo16Bits( std::ifstream *fp ) 
+                                 throw ( FormatError );
    bool ReadAndDecompressJPEGFile( std::ifstream *fp );
 
-   void BuildLUTRGBA( std::ifstream *fp );
-
    // In place (within Decompressed and with no fp access) decompression
    // or convertion:
    void BuildLUTRGBA();
-   bool DecompressRLE16BitsFromRLE8Bits( int NumberOfFrames );
    void ConvertSwapZone();
    void ConvertReorderEndianity();
    bool ConvertReArrangeBits() throw ( FormatError );
+   void ConvertFixGreyLevels();
    void ConvertRGBPlanesToRGBPixels();
    void ConvertYcBcRPlanesToRGBPixels();
    void ConvertHandleColor();
@@ -119,6 +112,7 @@ private:
    bool IsJPEGLossy;
    bool IsJPEG;
    bool IsRLELossless;
+   bool IsMPEG;
 
    RLEFramesInfo *RLEInfo;
    JPEGFragmentsInfo *JPEGInfo;
@@ -126,6 +120,7 @@ private:
    // For handling color stage
    int PlanarConfiguration;
    bool IsMonochrome;
+   bool IsMonochrome1;
    bool IsPaletteColor;
    bool IsYBRFull;
    bool HasLUT;