Some improvements for Write problems

[gdcm.git] / src / gdcmFile.h

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index dc1836226367ba2890ef6aaf9ab06cee594936f7..84288ff1dfabf71600cea9c0b193761118a79b71 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/07/30 11:40:13 $
-  Version:   $Revision: 1.39 $
+  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
@@ -31,10 +31,8 @@
 class GDCM_EXPORT gdcmFile
 {
 public:
-   gdcmFile(gdcmHeader *header);
-   gdcmFile(std::string const & filename, 
-            bool  exception_on_error = false, 
-            bool  skip_shadow        = false);
+   gdcmFile( gdcmHeader *header );
+   gdcmFile( std::string const & filename );
  
    virtual ~gdcmFile();
 
@@ -42,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();
@@ -50,13 +53,13 @@ public:
    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
-      // the caller might destroy it's image (without knowing it: think
-      // of a complicated interface where display is done with a library
-      // e.g. VTK) before calling the Write
+   // Allocates ExpectedSize bytes of memory at this->Data and copies the
+   // pointed data to it. Copying the image might look useless but
+   // the caller might destroy it's image (without knowing it: think
+   // of a complicated interface where display is done with a library
+   // e.g. VTK) before calling the Write
       
-   // voir gdcmHeader::SetImageDataSize ?!?         
+   // see also gdcmHeader::SetImageDataSize ?!?         
    bool SetImageData (void * data, size_t expectedSize);
 
    /// \todo When the caller is aware we simply point to the data:
@@ -93,15 +96,17 @@ private:
    bool gdcm_read_JPEG_file     (FILE *fp, void * image_buffer); 
    static int gdcm_read_RLE_fragment(char **areaToRead, long lengthToDecode, 
                                      long uncompressedSegmentSize, FILE *fp);
+
    // For JPEG 12 Bits, body in file gdcmJpeg12.cxx
    bool gdcm_read_JPEG_file12   (FILE *fp, void* image_buffer);
+
    // 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); 
 
-// Variables
+// members variables:
 
    /// \brief Header to use to load the file
    gdcmHeader *Header;
@@ -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;
 };
 
 //-----------------------------------------------------------------------------