X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelConvert.h;fp=src%2FgdcmPixelConvert.h;h=e65a701c0470924d1c532f48af57be3adcadb175;hb=e28b183ba68aa3cc84a44a779a31f9d906a1ad2f;hp=784c2e0e6b81cad59a94c8c9f7e60b67403c7404;hpb=40b909789581894e57a0d8f22d6f1f91f55e7f84;p=gdcm.git

diff --git a/src/gdcmPixelConvert.h b/src/gdcmPixelConvert.h
index 784c2e0e..e65a701c 100644
--- a/src/gdcmPixelConvert.h
+++ b/src/gdcmPixelConvert.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelConvert.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/15 10:43:28 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2004/10/18 12:49:23 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,6 +24,7 @@
 #include "gdcmRLEFramesInfo.h"
 #include "gdcmJPEGFragmentsInfo.h"
 #include "gdcmException.h"
+#include "gdcmHeader.h"
 
 namespace gdcm
 {
@@ -33,106 +34,37 @@ namespace gdcm
  *        migth take during the user demanded processes.
  */
 class GDCM_EXPORT PixelConvert {
-friend class File;
-   /// Pixel data represented as RGB after color interpretation
-   uint8_t* RGB;
-   size_t   RGBSize;          //aka ImageDataSize
-   /// Pixel data after decompression and bit/byte rearrangement.
-   uint8_t* Decompressed;
-   size_t   DecompressedSize;
-
-   // Set by the accessors:
-   size_t PixelOffset;
-   size_t PixelDataLength;
-   int XSize;
-   int YSize;
-   int ZSize;
-   int BitsAllocated;
-   int BitsStored;
-   int HighBitPosition;
-   int SamplesPerPixel;
-   int PixelSize;
-   bool PixelSign;
-   int SwapCode;
-
-   bool IsUncompressed;
-   bool IsJPEG2000;
-   bool IsJPEGLossless;
-   bool IsRLELossless;
-
-   RLEFramesInfo* RLEInfo;
-   JPEGFragmentsInfo* JPEGInfo;
-
-   // For handling color stage
-   int PlanarConfiguration;
-   bool IsMonochrome;
-   bool IsPaletteColor;
-   bool IsYBRFull;
-   bool HasLUT;
-
 public:
    PixelConvert();
    ~PixelConvert();
 
-   //// Setter accessors:
-   void SetXSize( int xSize ) { XSize = xSize; }
-   void SetYSize( int ySize ) { YSize = ySize; }
-   void SetZSize( int zSize ) { ZSize = zSize; }
-   void SetBitsAllocated( int bitsAllocated ) { BitsAllocated = bitsAllocated; }
-   void SetBitsStored( int bitsStored ) { BitsStored = bitsStored; }
-   void SetHighBitPosition( int highBitPosition )
-           { HighBitPosition = highBitPosition; }
-   void SetSamplesPerPixel( int samplesPerPixel )
-           { SamplesPerPixel = samplesPerPixel; }
-   void SetPixelSize( int pixelSize ) { PixelSize = pixelSize; }
-   void SetPixelSign( int pixelSign ) { PixelSign = pixelSign; }
-   void SetSwapCode( int swapCode ) { SwapCode = swapCode; }
-   void SetIsUncompressed( bool isUncompressed )
-           { IsUncompressed = isUncompressed; }
-   void SetIsJPEG2000( bool isJPEG2000 ) { IsJPEG2000 = isJPEG2000; }
-   void SetIsJPEGLossless( bool isJPEGLossless )
-           { IsJPEGLossless = isJPEGLossless; }
-   void SetIsRLELossless( bool isRLELossless )
-           { IsRLELossless = isRLELossless; }
-   void SetPixelOffset( size_t pixelOffset ) { PixelOffset = pixelOffset; }
-   void SetPixelDataLength( size_t pixelDataLength )
-           { PixelDataLength = pixelDataLength; }
-   void SetRLEInfo( RLEFramesInfo* inRLEFramesInfo )
-           { RLEInfo = inRLEFramesInfo; }
-   void SetJPEGInfo( JPEGFragmentsInfo* inJPEGFragmentsInfo )
-           { JPEGInfo = inJPEGFragmentsInfo; }
-
-   void SetPlanarConfiguration( size_t planarConfiguration )
-           { PlanarConfiguration = planarConfiguration; }
-   void SetIsMonochrome( bool isMonochrome ) { IsMonochrome = isMonochrome; }
-   void SetIsPaletteColor( bool isPaletteColor )
-           { IsPaletteColor = isPaletteColor; }
-   void SetIsYBRFull( bool isYBRFull ) { IsYBRFull = isYBRFull; }
-   void SetHasLUT ( bool hasLUT ) { HasLUT = hasLUT; }
- 
-   void     SetRGBSize( size_t size ) { RGBSize = size; }
-   void     SetDecompressedSize( size_t size ) { DecompressedSize = size; }
-
    //// Getter accessors:
    uint8_t* GetRGB() { return RGB; }
    size_t   GetRGBSize() { return RGBSize; }
    uint8_t* GetDecompressed() { return Decompressed; }
    size_t   GetDecompressedSize() { return DecompressedSize; }
+   uint8_t* GetLutRGBA() { return LutRGBA; }
 
    //// Predicates:
    bool IsDecompressedRGB();
 
-//////////////////////////////////////////////////////////
+// In progress
+   void GrabInformationsFromHeader( Header* header );
+   bool ReadAndDecompressPixelData( FILE* fp );
+   void Squeeze();
+   bool BuildRGBImage( FILE* fp );
+
 private:
    // Use the fp:
    bool ReadAndDecompressRLEFragment(
-                  uint8_t* decodedZone,
+                  uint8_t* subDecompressed,
                   long fragmentSize,
-                  long uncompressedSegmentSize,
+                  long decompressedSegmentSize,
                   FILE* fp );
    void ReadAndDecompress12BitsTo16Bits( FILE* fp ) throw ( FormatError );
    bool ReadAndDecompressRLEFile( FILE* fp );
    bool ReadAndDecompressJPEGFile( FILE* fp );
+   void BuildLUTRGBA( FILE* fp );
 
    // In place (within Decompressed and with no fp access) decompression
    // or convertion:
@@ -144,13 +76,58 @@ private:
    void ConvertYcBcRPlanesToRGBPixels();
    void ConvertHandleColor();
 
-   void ComputeDecompressedImageDataSize();
+   void ComputeDecompressedAndRGBSizes();
    void AllocateRGB();
    void AllocateDecompressed();
-public:
-// In progress
-   bool ReadAndDecompressPixelData( FILE* fp );
-   void Squeeze();
+
+// Variables
+   /// Pixel data represented as RGB after LUT color interpretation.
+   uint8_t* RGB;
+   /// Size of \ref RGB image.
+   size_t   RGBSize;
+   /// Pixel data after decompression and bit/byte rearrangement.
+   uint8_t* Decompressed;
+   /// Size of \ref Decompressed image.
+   size_t   DecompressedSize;
+   /// \brief Red/Green/Blue/Alpha LookUpTable build out of the
+   ///        Red/Green/Blue LUT descriptors (see \ref BuildLUTRGBA ).
+   uint8_t* LutRGBA;
+
+   size_t PixelOffset;
+   size_t PixelDataLength;
+   int XSize;
+   int YSize;
+   int ZSize;
+   int BitsAllocated;
+   int BitsStored;
+   int HighBitPosition;
+   int SamplesPerPixel;
+   int PixelSize;
+   bool PixelSign;
+   int SwapCode;
+
+   bool IsDecompressed;
+   bool IsJPEG2000;
+   bool IsJPEGLossless;
+   bool IsRLELossless;
+
+   RLEFramesInfo* RLEInfo;
+   JPEGFragmentsInfo* JPEGInfo;
+
+   // For handling color stage
+   int PlanarConfiguration;
+   bool IsMonochrome;
+   bool IsPaletteColor;
+   bool IsYBRFull;
+   bool HasLUT;
+   // The 3 LUT descriptors may be different:
+   std::string LutRedDescriptor;
+   std::string LutGreenDescriptor;
+   std::string LutBlueDescriptor;
+   uint8_t* LutRedData;
+   uint8_t* LutGreenData;
+   uint8_t* LutBlueData;
+
 };
 } // end namespace gdcm