* Fix :Oops ! Forgot to commit gdcmFile::GetImageDataSizeRaw();

[gdcm.git] / src / gdcmFile.h

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index f33eca6ef7fc5b04022a238c8abb461d934aa46f..caed93e645a8e4c5e70c86ab4f77802769718fb1 100644 (file)
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -15,7 +15,10 @@ class GDCM_EXPORT gdcmFile: public gdcmHeader
 {
 private:
    void* PixelData;
-   size_t lgrTotale;
+   size_t lgrTotaleRaw;  // Area length to receive the pixels
+   size_t lgrTotale;     // Area length to receive the RGB pixels
+                         // from Grey Plane + Palette Color
+
    int Parsed;               // weather already parsed
    std::string OrigFileName; // To avoid file overwrite
    void SwapZone(void* im, int swap, int lgr, int nb);
@@ -25,9 +28,11 @@ private:
    int gdcm_read_JPEG_file     (void * image_buffer); // For JPEG 8 Bits
    int gdcm_read_JPEG_file12   (void * image_buffer); // For JPEG 12 Bits
    int gdcm_read_JPEG2000_file (void * image_buffer); // For JPEG 2000 (TODO)
-   int gdcm_read_RLE_file      (void * image_buffer); // For Run Length Encoding (TODO) 
-    
-  
+
+// For Run Length Encoding (TOCHECK)
+   int gdcm_read_RLE_file      (void * image_buffer); 
+
+     
 protected:
    int WriteBase(std::string FileName, FileType type);
 public:
@@ -45,8 +50,11 @@ public:
 
    void   SetPixelDataSizeFromHeader(void);
    size_t GetImageDataSize();
+   size_t GetImageDataSizeRaw();
    void * GetImageData();
-   size_t GetImageDataIntoVector(void* destination, size_t MaxSize );
+   size_t GetImageDataIntoVector(void* destination, size_t MaxSize);
+   void * 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