new version of TestCopyDicom

[gdcm.git] / src / gdcmFile.h

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index a229157f442de84769f8eb1387effe7e590aa53a..90ea66afd248678bfd8c2d678af2cbe0bdb38765 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/08/02 16:42:14 $
-  Version:   $Revision: 1.42 $
+  Date:      $Date: 2004/09/13 07:49:36 $
+  Version:   $Revision: 1.47 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -40,8 +40,18 @@ public:
    gdcmHeader* GetHeader() { return Header; }
 
    void   SetPixelDataSizeFromHeader();
-   size_t GetImageDataSize();
-   size_t GetImageDataSizeRaw();
+   
+
+/// \brief     Returns the size (in bytes) of required memory to hold
+///            the pixel data represented in this file.
+   size_t GetImageDataSize(){ return ImageDataSize; };
+
+   
+/// \brief     Returns the size (in bytes) of required memory to hold
+///            the pixel data represented in this file, if user DOESN'T want 
+///            to get RGB pixels image when it's stored as a PALETTE COLOR image
+///            -the (vtk) user is supposed to know how to deal with LUTs-     
+   size_t GetImageDataSizeRaw(){ return ImageDataSizeRaw; };
 
    void * GetImageData();
    size_t GetImageDataIntoVector(void* destination, size_t maxSize);
@@ -84,7 +94,7 @@ protected:
 
 private:
    void SwapZone(void* im, int swap, int lgr, int nb);
-   
+   void SetInitialValues();  
    bool ReadPixelData(void * destination);
    
    // For JPEG 8 Bits, body in file gdcmJpeg.cxx
@@ -98,7 +108,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:
@@ -112,7 +122,7 @@ private:
    bool SelfHeader;
 
    /// \brief to hold the Pixels (when read)
-   void* PixelData;
+   void* Pixel_Data;  // (was PixelData; should be removed)
    
    /// \brief Area length to receive the pixels
    size_t ImageDataSizeRaw;
@@ -124,10 +134,45 @@ private:
   /// \brief ==1  if GetImageDataRaw was used
   ///        ==0  if GetImageData    was used
   ///        ==-1 if ImageData never read                       
-   int PixelRead;     
+   int PixelRead;
+   
+  /// wether already parsed 
+   bool Parsed;
+      
+  /// \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;    
+  /// \brief Bits Allocated              (0x0028,0x0100), as found on disk
+   std::string InitialBitsAllocated;
+   
+  // 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;
 
-   /// wether already parsed 
-   int Parsed;
 };
 
 //-----------------------------------------------------------------------------