X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.h;h=057f02bded1e096f6c68f40367092cac9d8219b0;hb=879f56a62d0772c95e92d0657882eb1886b4153d;hp=693bea288d7e845713aba397093b51eedf4df744;hpb=301f0d7ae54cda9ddfaacadfa25c843275c4de0c;p=gdcm.git diff --git a/src/gdcmFile.h b/src/gdcmFile.h index 693bea28..057f02bd 100644 --- a/src/gdcmFile.h +++ b/src/gdcmFile.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.h,v $ Language: C++ - Date: $Date: 2004/09/30 12:51:55 $ - Version: $Revision: 1.54 $ + 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 @@ -43,17 +43,12 @@ public: 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 ConvertReArrangeBits( + uint8_t* pixelZone, + size_t imageDataSize, + int numberBitsStored, + int numberBitsAllocated, + int highBitPosition ) throw ( gdcmFormatError ); /// Accessor to \ref ImageDataSize size_t GetImageDataSize(){ return ImageDataSize; }; @@ -96,7 +91,6 @@ protected: private: void Initialise(); - void SwapZone(void* im, int swap, int lgr, int nb); bool ReadPixelData(void* destination); @@ -115,15 +109,6 @@ private: // 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); - 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