X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.h;h=84288ff1dfabf71600cea9c0b193761118a79b71;hb=7a06c1759c4f03b6c8dc7780bfda9b508a2250c5;hp=a229157f442de84769f8eb1387effe7e590aa53a;hpb=32fd7ed911ec51eaf623bdd9f32aa09297519589;p=gdcm.git

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index a229157f..84288ff1 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/08/02 16:42:14 $
-  Version:   $Revision: 1.42 $
+  Date:      $Date: 2004/09/01 16:23:59 $
+  Version:   $Revision: 1.43 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -40,7 +40,12 @@ public:
    gdcmHeader* GetHeader() { return Header; }
 
    void   SetPixelDataSizeFromHeader();
-   size_t GetImageDataSize();
+   
+
+/// \brief     Returns the size (in bytes) of required memory to hold
+///            the pixel data represented in this file.
+   size_t GetImageDataSize(){ return ImageDataSize; };
+
    size_t GetImageDataSizeRaw();
 
    void * GetImageData();
@@ -98,7 +103,7 @@ private:
    // For JPEG 2000, body in file gdcmJpeg2000.cxx
    bool gdcm_read_JPEG2000_file (FILE *fp, void* image_buffer);
 
-   // For Run Length Encoding (TOCHECK)
+   // For Run Length Encoding
    bool gdcm_read_RLE_file      (FILE *fp, void* image_buffer); 
 
 // members variables:
@@ -124,10 +129,22 @@ private:
   /// \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; 
+   
+   /// \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;    
+   /// \brief Bits Allocated              (0x0028,0x0100), as found on disk
+   std::string InitialBitsAllocated;
    /// wether already parsed 
-   int Parsed;
+   bool Parsed;
 };
 
 //-----------------------------------------------------------------------------