X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.h;h=057f02bded1e096f6c68f40367092cac9d8219b0;hb=879f56a62d0772c95e92d0657882eb1886b4153d;hp=a1558cf2d5b41ce94b0b5afa541d897049c8bf2f;hpb=7eb058ef98b0003b379bf0db33e5c4c673b7f1e6;p=gdcm.git diff --git a/src/gdcmFile.h b/src/gdcmFile.h index a1558cf2..057f02bd 100644 --- a/src/gdcmFile.h +++ b/src/gdcmFile.h @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmFile.h,v $ Language: C++ - Date: $Date: 2004/09/20 18:14:23 $ - Version: $Revision: 1.49 $ + Date: $Date: 2004/10/08 17:02:53 $ + Version: $Revision: 1.58 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -32,57 +32,54 @@ class GDCM_EXPORT gdcmFile { public: gdcmFile( gdcmHeader *header ); - gdcmFile( std::string const & filename ); + gdcmFile( std::string const& filename ); virtual ~gdcmFile(); /// Accessor to \ref Header gdcmHeader* GetHeader() { return Header; } - void SetPixelDataSizeFromHeader(); - + int ComputeDecompressedPixelDataSizeFromHeader(); -/// \brief Returns the size (in bytes) of required memory to hold -/// the pixel data represented in this file. + void ConvertRGBPlanesToRGBPixels( uint8_t* source, uint8_t* destination ); + void ConvertYcBcRPlanesToRGBPixels( uint8_t* source, uint8_t* destination ); + void ConvertReArrangeBits( + uint8_t* pixelZone, + size_t imageDataSize, + int numberBitsStored, + int numberBitsAllocated, + int highBitPosition ) throw ( gdcmFormatError ); + + /// Accessor to \ref ImageDataSize size_t GetImageDataSize(){ return ImageDataSize; }; - -/// \brief Returns the size (in bytes) of required memory to hold -/// the pixel data represented in this file, if user DOESN'T want -/// to get RGB pixels image when it's stored as a PALETTE COLOR image -/// -the (vtk) user is supposed to know how to deal with LUTs- + /// Accessor to \ref ImageDataSizeRaw size_t GetImageDataSizeRaw(){ return ImageDataSizeRaw; }; - void * GetImageData(); + uint8_t* GetImageData(); size_t GetImageDataIntoVector(void* destination, size_t maxSize); - void * GetImageDataRaw(); + uint8_t* GetImageDataRaw(); size_t GetImageDataIntoVectorRaw(void* destination, size_t maxSize); - // Allocates ExpectedSize bytes of memory at this->Data and copies the - // pointed data to it. Copying the image might look useless but - // the caller might destroy it's image (without knowing it: think - // of a complicated interface where display is done with a library - // e.g. VTK) before calling the Write - // see also gdcmHeader::SetImageDataSize ?!? - bool SetImageData (void * data, size_t expectedSize); + bool SetImageData (uint8_t* data, size_t expectedSize); /// \todo When the caller is aware we simply point to the data: - /// int SetImageDataNoCopy (void * Data, size_t ExpectedSize); + /// int SetImageDataNoCopy (void* Data, size_t ExpectedSize); // Write pixels of ONE image on hard drive // No test is made on processor "endianity" // The user must call his reader correctly - bool WriteRawData (std::string const & fileName); - bool WriteDcmImplVR(std::string const & fileName); - bool WriteDcmExplVR(std::string const & fileName); - bool WriteAcr (std::string const & fileName); + bool WriteRawData (std::string const& fileName); + bool WriteDcmImplVR(std::string const& fileName); + bool WriteDcmExplVR(std::string const& fileName); + bool WriteAcr (std::string const& fileName); // Don't look any longer for the code : // It's in file gdcmParsePixels.cxx bool ParsePixelData(); - virtual bool SetEntryByNumber(std::string const & content, + virtual bool SetEntryByNumber(std::string const& content, uint16_t group, uint16_t element) { Header->SetEntryByNumber(content,group,element); @@ -90,36 +87,27 @@ public: } protected: - bool WriteBase(std::string const & fileName, FileType type); + bool WriteBase(std::string const& fileName, FileType type); private: - void SwapZone(void* im, int swap, int lgr, int nb); + void Initialise(); - bool ReadPixelData(void * destination); + bool ReadPixelData(void* destination); // For JPEG 8 Bits, body in file gdcmJpeg.cxx - bool gdcm_read_JPEG_file (FILE *fp, void * image_buffer); - bool gdcm_write_JPEG_file (FILE *fp, void * image_buffer, + bool gdcm_read_JPEG_file (FILE* fp, void* image_buffer); + bool gdcm_write_JPEG_file (FILE* fp, void* image_buffer, int image_width, int image_heigh, int quality); // For JPEG 12 Bits, body in file gdcmJpeg12.cxx - bool gdcm_read_JPEG_file12 (FILE *fp, void* image_buffer); - bool gdcm_write_JPEG_file12 (FILE *fp, void* image_buffer, + bool gdcm_read_JPEG_file12 (FILE* fp, void* image_buffer); + bool gdcm_write_JPEG_file12 (FILE* fp, void* image_buffer, int image_width, int image_height, int quality); // For JPEG 2000, body in file gdcmJpeg2000.cxx - bool gdcm_read_JPEG2000_file (FILE *fp, void* image_buffer); - - // For Run Length Encoding - bool gdcm_read_RLE_file (FILE *fp, void* image_buffer); -// FIXME : *sure* it's NOT static (C++) -// (would be static in C, or embedded in ADA) -// It's NOT a method, but a not user intended fonction. -// How do we write that in C++ ?) - static int gdcm_read_RLE_fragment(char **areaToRead, long lengthToDecode, - long uncompressedSegmentSize, FILE *fp); + bool gdcm_read_JPEG2000_file (FILE* fp, void* image_buffer); void SaveInitialValues(); // will belong to the future gdcmPixelData class void RestoreInitialValues(); // will belong to the future gdcmPixelData class @@ -138,20 +126,23 @@ private: /// wether already parsed bool Parsed; - // - // --------------- Will be moved to a gdcmPixelData class - // +// +// --------------- Will be moved to a gdcmPixelData class +// /// \brief to hold the Pixels (when read) - void* Pixel_Data; // (was PixelData) + uint8_t* Pixel_Data; // (was PixelData) - /// \brief Area length to receive the Gray Level pixels + /// \brief Size (in bytes) of required memory to hold the Gray Level pixels + /// represented in this file. This is used when the user DOESN'T want + /// the RGB pixels image when it's stored as a PALETTE COLOR image size_t ImageDataSizeRaw; - /// \brief Area length to receive the pixels making RGB - /// from Plane R, Plane G, Plane B - /// or from Grey Plane + Palette Color - /// or from YBR Pixels (or from RGB Pixels, as well) + /// \brief Size (in bytes) of requited memory to hold the the pixels + /// of this image in it's RGB convertion either from: + /// - Plane R, Plane G, Plane B + /// - Grey Plane + Palette Color + /// - YBR Pixels (or from RGB Pixels, as well) size_t ImageDataSize; /// \brief ==1 if GetImageDataRaw was used @@ -164,8 +155,6 @@ private: size_t LastAllocatedPixelDataLength; // Initial values of some fields that can be modified during reading process - // (in a future stage, they will be modified just before the writting process - // and restored just after) // if user asked to transform gray level + LUT image into RGB image /// \brief Samples Per Pixel (0x0028,0x0002), as found on disk @@ -176,8 +165,6 @@ private: std::string InitialPlanConfig; // Initial values of some fields that can be modified during reading process - // (in a future stage, they will be modified just before the writting process - // and restored just after) // if the image was a 'strange' ACR-NEMA // (Bits Allocated=12, High Bit not equal to Bits stored +1) /// \brief Bits Allocated (0x0028,0x0100), as found on disk @@ -186,8 +173,6 @@ private: std::string InitialHighBit; // some DocEntry that can be moved out of the H table during reading process - // (in a future stage, they will be modified just before the writting process - // and restored just after) // if user asked to transform gray level + LUT image into RGB image // We keep a pointer on them for a future use. @@ -205,9 +190,9 @@ private: /// \brief Blue Palette Color Lookup Table Data 0028 1203 as read gdcmDocEntry* InitialBlueLUTData; - // - // --------------- end of future gdcmPixelData class - // +// +// --------------- end of future gdcmPixelData class +// };