X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelConvert.h;h=e0e2b818e52958fc644ed90981c8466b9104afeb;hb=eafd36f8a658f5d3b29e733bf87540150feaddf6;hp=02f11f3b3db41ae1acfddd15442be418ec2c9803;hpb=15424662ec90f5a5071bcf32e7f6dc09cead024d;p=gdcm.git

diff --git a/src/gdcmPixelConvert.h b/src/gdcmPixelConvert.h
index 02f11f3b..e0e2b818 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/08 17:02:53 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2004/10/12 09:59:45 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,78 +22,118 @@
 
 #include "gdcmCommon.h"
 #include "gdcmRLEFramesInfo.h"
+#include "gdcmJPEGFragmentsInfo.h"
 #include "gdcmException.h"
 
+namespace gdcm
+{
+                                                                                
 /*
  * \brief Utility container for gathering the various forms the pixel data
  *        migth take during the user demanded processes.
  */
-class GDCM_EXPORT gdcmPixelConvert {
-friend class gdcmFile;
+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* Uncompressed;
-   size_t   UncompressedSize;
+   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;
+   
+private:
+   bool ReadAndUncompressRLEFragment(
+                  uint8_t* decodedZone,
+                  long fragmentSize,
+                  long uncompressedSegmentSize,
+                  FILE* fp );
 public:
-   gdcmPixelConvert();
-   ~gdcmPixelConvert();
+   PixelConvert();
+   ~PixelConvert();
+
+   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; }
 
    uint8_t* GetRGB() { return RGB; }
    void     SetRGBSize( size_t size ) { RGBSize = size; }
    size_t   GetRGBSize() { return RGBSize; }
    void     AllocateRGB();
 
-   uint8_t* GetUncompressed() { return Uncompressed; }
-   void     SetUncompressedSize( size_t size ) { UncompressedSize = size; }
-   size_t   GetUncompressedSize() { return UncompressedSize; }
-   void     AllocateUncompressed();
+   uint8_t* GetDecompressed() { return Decompressed; }
+   void     SetDecompressedSize( size_t size ) { DecompressedSize = size; }
+   size_t   GetDecompressedSize() { return DecompressedSize; }
+   void     AllocateDecompressed();
 
-   void Squeeze();
 //////////////////////////////////////////////////////////
 // In progress
-bool ReadAndUncompress12Bits( FILE* filePointer,
-                              size_t uncompressedSize,
-                              size_t PixelNumber );
-bool ReadUncompressed( FILE* filePointer,
-                       size_t uncompressedSize,
-                       size_t expectedSize );
-bool ConvertGrayAndLutToRGB( uint8_t *lutRGBA );
-bool ReadAndUncompressRLE8Bits(FILE* fp, size_t uncompressedSize );
-
-   static bool UncompressRLE16BitsFromRLE8Bits(
-                  int XSize,
-                  int YSize,
+private:
+   bool UncompressRLE16BitsFromRLE8Bits(
                   int NumberOfFrames,
                   uint8_t* fixMemUncompressed );
-   static bool ReadAndUncompressRLEFragment(
-                  uint8_t* decodedZone,
-                  long fragmentSize,
-                  long uncompressedSegmentSize,
-                  FILE* fp );
-   static bool gdcm_read_RLE_file(
-                  void* image_buffer,
-                  int XSize,
-                  int YSize,
-                  int ZSize,
-                  int BitsAllocated,
-                  gdcmRLEFramesInfo* RLEInfo,
-                  FILE* fp );
-   static void ConvertDecompress12BitsTo16Bits(
-                  uint8_t* pixelZone,
-                  int sizeX,
-                  int sizeY,
-                  FILE* filePtr) throw ( gdcmFormatError );
-   static void SwapZone(void* im, int swap, int lgr, int nb);
-   static void ConvertReorderEndianity(
+   void ComputeDecompressedImageDataSize();
+   void Decompress12BitsTo16Bits(
                   uint8_t* pixelZone,
-                  size_t imageDataSize,
-                  int numberBitsStored,
-                  int numberBitsAllocated,
-                  int swapCode,
-                  bool signedPixel );
+                  FILE* filePtr) throw ( FormatError );
+   bool ReadAndDecompressRLEFile( void* image_buffer, FILE* fp );
+   bool ReadAndDecompressJPEGFile( uint8_t* destination, FILE* fp );
+   void SwapZone( uint8_t* im );
+public:
+   void ReorderEndianity( uint8_t* pixelZone );
+   bool ReArrangeBits( uint8_t* pixelZone ) throw ( FormatError );
+         void ConvertRGBPlanesToRGBPixels(
+                  uint8_t* destination,
+                  size_t imageDataSize );
+          void ConvertYcBcRPlanesToRGBPixels(
+                  uint8_t* destination,
+                  size_t imageDataSize );
+          bool ReadAndDecompressPixelData( void* destination, FILE* fp );
+   void Squeeze();
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif