X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.h;h=a69011f8edb61b4b91d0fdf397ef7260e32f0ac2;hb=8ac4df8c7543a827c7b89fc9bbcf86625f3c1afe;hp=c824a342cbebd8c089af1af819f1c29659885298;hpb=00b6e0ddcbdbd41252e03732783f65efe5f52526;p=gdcm.git diff --git a/src/gdcmFile.h b/src/gdcmFile.h index c824a342..a69011f8 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/06/26 04:09:33 $ - Version: $Revision: 1.36 $ + Date: $Date: 2004/10/01 12:40:57 $ + Version: $Revision: 1.55 $ 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 @@ -31,89 +31,110 @@ class GDCM_EXPORT gdcmFile { public: - gdcmFile(gdcmHeader *header); - gdcmFile(std::string const & filename, - bool exception_on_error = false, - bool enable_sequences = false, - bool skip_shadow = false); + gdcmFile( gdcmHeader *header ); + gdcmFile( std::string const& filename ); virtual ~gdcmFile(); - /// \brief returns the gdcmHeader *Header - inline gdcmHeader *GetHeader() { return Header; } - - // For promotion (performs a deepcopy of pointed header object) - // TODO Swig gdcmFile(gdcmHeader* header); - // TODO Swig ~gdcmFile(); + /// Accessor to \ref Header + gdcmHeader* GetHeader() { return Header; } + + int ComputeDecompressedPixelDataSizeFromHeader(); + + 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 ); + void ConvertReorderEndianity( + uint8_t* pixelZone, + size_t imageDataSize, + int numberBitsStored, + int numberBitsAllocated, + bool signedPixel ); + void ConvertDecompress12BitsTo16Bits( + uint8_t* pixelZone, + int sizeX, + int sizeY, + FILE* filePtr) throw ( gdcmFormatError); + + /// Accessor to \ref ImageDataSize + size_t GetImageDataSize(){ return ImageDataSize; }; - // On writing purposes. When instance was created through - // gdcmFile(std::string filename) then the filename argument MUST be - // different from the constructor's one (no overwriting allowed). - // TODO Swig int SetFileName(std::string filename); + /// Accessor to \ref ImageDataSizeRaw + size_t GetImageDataSizeRaw(){ return ImageDataSizeRaw; }; - void SetPixelDataSizeFromHeader(); - size_t GetImageDataSize(); - size_t GetImageDataSizeRaw(); + uint8_t* GetImageData(); + size_t GetImageDataIntoVector(void* destination, size_t maxSize); + uint8_t* GetImageDataRaw(); + size_t GetImageDataIntoVectorRaw(void* destination, size_t maxSize); - void * GetImageData(); - size_t GetImageDataIntoVector(void* destination, size_t MaxSize); - void * GetImageDataRaw(); - size_t GetImageDataIntoVectorRaw(void* destination, size_t MaxSize); + // see also gdcmHeader::SetImageDataSize ?!? + bool SetImageData (uint8_t* data, size_t expectedSize); - // 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 - - // voir gdcmHeader::SetImageDataSize ?!? - bool SetImageData (void * Data, size_t ExpectedSize); - // When the caller is aware we simply point to the data: - // TODO int SetImageDataNoCopy (void * Data, size_t ExpectedSize); - - // Push to disk. - // TODO Swig int Write(); + /// \todo When the caller is aware we simply point to the data: + /// 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(); - inline virtual bool SetEntryByNumber(std::string const & content, - guint16 group, guint16 element) + virtual bool SetEntryByNumber(std::string const& content, + uint16_t group, uint16_t element) { - GetHeader()->SetEntryByNumber(content,group,element); - return true; //default behavior ? + Header->SetEntryByNumber(content,group,element); + return true; } protected: - bool WriteBase(std::string const & FileName, FileType type); + bool WriteBase(std::string const& fileName, FileType type); private: + void Initialise(); void SwapZone(void* im, int swap, int lgr, int nb); - - 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); - static int gdcm_read_RLE_fragment(char **areaToRead, long lengthToDecode, - long uncompressedSegmentSize,FILE *fp); + 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_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); + 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); - // For Run Length Encoding (TOCHECK) - bool gdcm_read_RLE_file (FILE *fp,void * image_buffer); + void SaveInitialValues(); // will belong to the future gdcmPixelData class + void RestoreInitialValues(); // will belong to the future gdcmPixelData class + void DeleteInitialValues(); // will belong to the future gdcmPixelData class -// Variables +// members variables: /// \brief Header to use to load the file gdcmHeader *Header; @@ -122,24 +143,78 @@ private: /// the constructor or passed to the constructor. When false /// the destructor is in charge of deletion. bool SelfHeader; + + /// wether already parsed + bool Parsed; + +// +// --------------- Will be moved to a gdcmPixelData class +// /// \brief to hold the Pixels (when read) - void* PixelData; + uint8_t* Pixel_Data; // (was PixelData) - /// \brief Area length to receive the 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 RGB pixels - /// from Grey Plane + Palette Color + /// \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 /// ==0 if GetImageData was used /// ==-1 if ImageData never read - int PixelRead; + int PixelRead; + + /// \brief length of the last allocated area devoided to receive Pixels + /// ( to allow us not to (free + new) if un necessary ) + size_t LastAllocatedPixelDataLength; + + // Initial values of some fields that can be modified during reading process + // if user asked to transform gray level + LUT image into RGB image + + /// \brief Samples Per Pixel (0x0028,0x0002), as found on disk + std::string InitialSpp; + /// \brief Photometric Interpretation (0x0028,0x0004), as found on disk + std::string InitialPhotInt; + /// \brief Planar Configuration (0x0028,0x0006), as found on disk + std::string InitialPlanConfig; + + // Initial values of some fields that can be modified during reading process + // 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 + std::string InitialBitsAllocated; + /// \brief High Bit (0x0028,0x0102), as found on disk + std::string InitialHighBit; + + // some DocEntry that can be moved out of the H table during reading process + // if user asked to transform gray level + LUT image into RGB image + // We keep a pointer on them for a future use. + + /// \brief Red Palette Color Lookup Table Descriptor 0028 1101 as read + gdcmDocEntry* InitialRedLUTDescr; + /// \brief Green Palette Color Lookup Table Descriptor 0028 1102 as read + gdcmDocEntry* InitialGreenLUTDescr; + /// \brief Blue Palette Color Lookup Table Descriptor 0028 1103 as read + gdcmDocEntry* InitialBlueLUTDescr; + + /// \brief Red Palette Color Lookup Table Data 0028 1201 as read + gdcmDocEntry* InitialRedLUTData; + /// \brief Green Palette Color Lookup Table Data 0028 1202 as read + gdcmDocEntry* InitialGreenLUTData; + /// \brief Blue Palette Color Lookup Table Data 0028 1203 as read + gdcmDocEntry* InitialBlueLUTData; + +// +// --------------- end of future gdcmPixelData class +// - /// wether already parsed - int Parsed; }; //-----------------------------------------------------------------------------