X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.h;h=908370961863810ff393fd9bf7c9e625f16758df;hb=332835b05f78803ae6d2e92cf95c25548a229532;hp=a8926b72541d8532428b8218e0eca0964893d487;hpb=e40fc77cef3155aab87305ce2f8f14d1acbf158f;p=gdcm.git

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index a8926b72..90837096 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/07/02 13:55:28 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2004/09/03 07:57:10 $
+  Version:   $Revision: 1.44 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -31,11 +31,8 @@
 class GDCM_EXPORT gdcmFile
 {
 public:
-   gdcmFile(gdcmHeader *header);
-   gdcmFile(std::string const & filename, 
-            bool  exception_on_error = false, 
-            bool  enable_sequences   = false,
-            bool  skip_shadow        = false);
+   gdcmFile( gdcmHeader *header );
+   gdcmFile( std::string const & filename );
  
    virtual ~gdcmFile();
 
@@ -43,22 +40,27 @@ 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();
-   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);
+   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 ?!?         
-   bool SetImageData     (void * Data, size_t ExpectedSize);
+   // see also gdcmHeader::SetImageDataSize ?!?         
+   bool SetImageData (void * data, size_t expectedSize);
 
    /// \todo When the caller is aware we simply point to the data:
    /// int SetImageDataNoCopy (void * Data, size_t ExpectedSize);
@@ -78,12 +80,12 @@ public:
    virtual bool SetEntryByNumber(std::string const & content,
                                  uint16_t group, uint16_t element)
    { 
-      GetHeader()->SetEntryByNumber(content,group,element);
-      return true;  /// \todo default behavior ?
+      Header->SetEntryByNumber(content,group,element);
+      return true;
    }
      
 protected:
-   bool WriteBase(std::string const & FileName, FileType type);
+   bool WriteBase(std::string const & fileName, FileType type);
 
 private:
    void SwapZone(void* im, int swap, int lgr, int nb);
@@ -91,18 +93,20 @@ private:
    bool ReadPixelData(void * destination);
    
    // For JPEG 8 Bits, body in file gdcmJpeg.cxx
-   bool gdcm_read_JPEG_file     (FILE *fp,void * image_buffer); 
+   bool gdcm_read_JPEG_file     (FILE *fp, void * image_buffer); 
    static int gdcm_read_RLE_fragment(char **areaToRead, long lengthToDecode, 
-                                     long uncompressedSegmentSize,FILE *fp);
+                                     long uncompressedSegmentSize, FILE *fp);
+
    // For JPEG 12 Bits, body in file gdcmJpeg12.cxx
-   bool gdcm_read_JPEG_file12   (FILE *fp,void * image_buffer);
+   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);
+   bool gdcm_read_JPEG2000_file (FILE *fp, void* image_buffer);
 
-   // For Run Length Encoding (TOCHECK)
-   bool gdcm_read_RLE_file      (FILE *fp,void * image_buffer); 
+   // 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;
@@ -125,10 +129,25 @@ 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; 
+   
+  /// \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;
 };
 
 //-----------------------------------------------------------------------------