X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.h;h=29a5b12dd4f6c8be3e83b6232377900cb5b0dae4;hb=51abd894d28414395ba07e24487276e85f4cd604;hp=a9839600053cf50dc5af3d8ce7f1de74f3e491e8;hpb=0ad9dae4659b21bfd5c834c1af724eab4dcdf4f6;p=gdcm.git diff --git a/src/gdcmPixelReadConvert.h b/src/gdcmPixelReadConvert.h index a9839600..29a5b12d 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/23 10:12:34 $ - Version: $Revision: 1.13 $ + Date: $Date: 2005/02/03 10:03:07 $ + Version: $Revision: 1.18 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -40,45 +40,33 @@ 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 GrabInformationsFromHeader( File *f ); + 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 ); + void ReadAndDecompress12BitsTo16Bits( std::ifstream *fp ) + throw ( FormatError ); bool ReadAndDecompressJPEGFile( std::ifstream *fp ); - bool ReadAndDecompressJPEGFramesFromFile( std::ifstream *fp ); - bool ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream *fp ); - bool ReadAndDecompressJPEGFragmentedFramesFromFile( 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 );