ENH: Some fixes for gdcm installation

[gdcm.git] / src / gdcmFile.h

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index adada47f54d04468e79ed2da55c7d4707cdc768a..057f02bded1e096f6c68f40367092cac9d8219b0 100644 (file)
--- 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/29 17:33:17 $
-  Version:   $Revision: 1.53 $
+  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
@@ -40,6 +40,15 @@ public:
    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 );
    
    /// Accessor to \ref ImageDataSize
    size_t GetImageDataSize(){ return ImageDataSize; };
@@ -82,7 +91,6 @@ protected:
 
 private:
    void Initialise();
-   void SwapZone(void* im, int swap, int lgr, int nb);
 
    bool ReadPixelData(void* destination);
    
@@ -101,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