X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.h;h=aea3ec34a208a79997301f8e49a6a75433954460;hb=7350639601914cd8ab02bfb0d6668c5bf56ce2f4;hp=af5e4bbd3513aa16270b19797d1d6c85035543d0;hpb=dd4e6402f3542ddd5e1cc14a29ca3f84a9f063b6;p=gdcm.git

diff --git a/src/gdcmPixelReadConvert.h b/src/gdcmPixelReadConvert.h
index af5e4bbd..aea3ec34 100644
--- a/src/gdcmPixelReadConvert.h
+++ b/src/gdcmPixelReadConvert.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/12 17:21:07 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2005/01/31 05:24:21 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,62 +21,53 @@
 #define GDCMPIXELREADCONVERT_H
 
 #include "gdcmCommon.h"
+#include "gdcmBase.h"
 #include "gdcmException.h"
 
 namespace gdcm
 {
-class Header;
+class File;
 class RLEFramesInfo;
 class JPEGFragmentsInfo;
-/*
+
+/**
  * \brief Utility container for gathering the various forms the pixel data
  *        migth take during the user demanded processes.
  */
-class GDCM_EXPORT PixelReadConvert
+class GDCM_EXPORT PixelReadConvert : public Base
 {
 public:
    PixelReadConvert();
    virtual ~PixelReadConvert();
 
    //// Getter accessors:
-   uint8_t* GetRGB() { return RGB; }
+   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; }
 
    //// Predicates:
    bool IsRawRGB();
 
-   void Print( std::string indent = "", std::ostream &os = std::cout );
+   void Print( std::ostream &os = std::cout, std::string const & indent = "" );
 
 // In progress
-   void GrabInformationsFromHeader( Header* header );
-   bool ReadAndDecompressPixelData( std::ifstream* fp );
+   void GrabInformationsFromFile( File *file );
+   bool ReadAndDecompressPixelData( std::ifstream *fp );
    void Squeeze();
    bool BuildRGBImage();
 
 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 );
-   bool ReadAndDecompressJPEGFile( std::ifstream* fp );
-   bool ReadAndDecompressJPEGFramesFromFile( std::ifstream* fp );
-   bool ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream* fp );
-   bool ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream* fp );
-
+   void ReadAndDecompress12BitsTo16Bits( std::ifstream *fp ) throw ( FormatError );
+   bool ReadAndDecompressJPEGFile( std::ifstream *fp );
 
-   void BuildLUTRGBA( 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 );
@@ -90,16 +81,16 @@ private:
 
 // Variables
    /// Pixel data represented as RGB after LUT color interpretation.
-   uint8_t* RGB;
-   /// Size of \ref RGB image.
+   uint8_t *RGB;
+   /// Size of RGB image.
    size_t   RGBSize;
    /// Pixel data after decompression and bit/byte rearrangement.
-   uint8_t* Raw;
-   /// Size of \ref Decompressed image.
+   uint8_t *Raw;
+   /// Size of Decompressed image.
    size_t   RawSize;
    /// \brief Red/Green/Blue/Alpha LookUpTable build out of the
    ///        Red/Green/Blue LUT descriptors (see \ref BuildLUTRGBA ).
-   uint8_t* LutRGBA;
+   uint8_t *LutRGBA;
 
    size_t PixelOffset;
    size_t PixelDataLength;
@@ -116,11 +107,14 @@ private:
 
    bool IsRaw;
    bool IsJPEG2000;
+   bool IsJPEGLS;
    bool IsJPEGLossless;
+   bool IsJPEGLossy;
+   bool IsJPEG;
    bool IsRLELossless;
 
-   RLEFramesInfo* RLEInfo;
-   JPEGFragmentsInfo* JPEGInfo;
+   RLEFramesInfo *RLEInfo;
+   JPEGFragmentsInfo *JPEGInfo;
 
    // For handling color stage
    int PlanarConfiguration;
@@ -132,9 +126,9 @@ private:
    std::string LutRedDescriptor;
    std::string LutGreenDescriptor;
    std::string LutBlueDescriptor;
-   uint8_t* LutRedData;
-   uint8_t* LutGreenData;
-   uint8_t* LutBlueData;
+   uint8_t *LutRedData;
+   uint8_t *LutGreenData;
+   uint8_t *LutBlueData;
 
 };
 } // end namespace gdcm