X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.h;h=5c34a043d2e86bbc12816ec99d53f2d7964b5bb0;hb=77cbc8232f9308aafb17bde18ef9549be212b741;hp=047d31939d215b3475fc4ffea9c5c1a1d9996931;hpb=0e0403151bbff57175d2b974ee2d14b8195f9234;p=gdcm.git

diff --git a/src/gdcmPixelReadConvert.h b/src/gdcmPixelReadConvert.h
index 047d3193..5c34a043 100644
--- 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/07/30 18:27:00 $
+  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
@@ -20,9 +20,9 @@
 #ifndef GDCMPIXELREADCONVERT_H
 #define GDCMPIXELREADCONVERT_H
 
-#include "gdcmCommon.h"
 #include "gdcmBase.h"
 #include "gdcmException.h"
+#include <fstream>
 
 namespace gdcm
 {
@@ -30,9 +30,13 @@ class File;
 class RLEFramesInfo;
 class JPEGFragmentsInfo;
 
+typedef void (*VOID_FUNCTION_PUINT8_PFILE_POINTER)(uint8_t *, File *);
+
 /**
  * \brief Utility container for gathering the various forms the pixel data
  *        migth take during the user demanded processes.
+ * WARNING : *none* of these functions may be invoked by gdm user
+ *           (internal use only)
  */
 class GDCM_EXPORT PixelReadConvert : public Base
 {
@@ -40,44 +44,40 @@ public:
    PixelReadConvert();
    virtual ~PixelReadConvert();
 
-   //// Getter accessors:
-   uint8_t* GetRGB()     { return RGB; }
-   size_t   GetRGBSize() { return RGBSize; }
-   uint8_t* GetRaw()     { return Raw; }
-   size_t   GetRawSize() { return RawSize; }
-   uint8_t* GetLutRGBA() { return LutRGBA; }
-
-   //// Predicates:
+   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;     }
+   size_t   GetRawSize()       { return RawSize; }
+   uint8_t *GetLutRGBA()       { return LutRGBA; }
+   int      GetLutItemNumber() { return LutItemNumber; }
+   int      GetLutItemSize()   { return LutItemSize;   }
+   // 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 );
    void Squeeze();
    bool BuildRGBImage();
+   void BuildLUTRGBA();
 
+   void SetUserFunction( VOID_FUNCTION_PUINT8_PFILE_POINTER userFunc ) 
+                         { UserFunction = userFunc; }
 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();
@@ -87,7 +87,11 @@ private:
    void AllocateRaw();
 
 // Variables
-   /// Pixel data represented as RGB after LUT color interpretation.
+/**
+ * \brief Pixel data represented as RGB after LUT color interpretation.
+ *        'uint8_t' is just to avoid warnings at compile time.
+ *        feel free to cast it as uint16_t if you need
+ */ 
    uint8_t *RGB;
    /// Size of RGB image.
    size_t   RGBSize;
@@ -98,6 +102,11 @@ private:
    /// \brief Red/Green/Blue/Alpha LookUpTable build out of the
    ///        Red/Green/Blue LUT descriptors (see \ref BuildLUTRGBA ).
    uint8_t *LutRGBA;
+   int LutItemNumber;
+   int LutItemSize;
+
+   // *ALL* the following info belong to the FileHelper
+   // One should think there is an analyze error in the model !
 
    size_t PixelOffset;
    size_t PixelDataLength;
@@ -108,7 +117,7 @@ private:
    int BitsStored;
    int HighBitPosition;
    int SamplesPerPixel;
-   int PixelSize;
+   //int PixelSize; // useless
    bool PixelSign;
    int SwapCode;
 
@@ -119,6 +128,7 @@ private:
    bool IsJPEGLossy;
    bool IsJPEG;
    bool IsRLELossless;
+   bool IsMPEG;
 
    RLEFramesInfo *RLEInfo;
    JPEGFragmentsInfo *JPEGInfo;
@@ -126,6 +136,7 @@ private:
    // For handling color stage
    int PlanarConfiguration;
    bool IsMonochrome;
+   bool IsMonochrome1;
    bool IsPaletteColor;
    bool IsYBRFull;
    bool HasLUT;
@@ -136,7 +147,9 @@ private:
    uint8_t *LutRedData;
    uint8_t *LutGreenData;
    uint8_t *LutBlueData;
-
+   
+   File *FileInternal; // must be passed to User Function
+   VOID_FUNCTION_PUINT8_PFILE_POINTER UserFunction;
 };
 } // end namespace gdcm