* gdcmHeader is now aggregating gdcmFile, and not derived into. Thus, we

[gdcm.git] / src / gdcmFile.h

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index e9bf7081b0321b3c8ff4516253f3469f294095a2..9fc32baed090dbfc5dfb690aa5d77036b44a932f 100644 (file)
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -11,24 +11,42 @@
 // for accessing the image/volume content. One can also use it to
 // write Dicom files.
 
-class GDCM_EXPORT gdcmFile: public gdcmHeader
+class GDCM_EXPORT gdcmFile
 {
 private:
+   gdcmHeader *Header;   // Header to use to load the file
+   bool SelfHeader;
+
    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);
+   
    bool ReadPixelData(void * destination);
    
-   int gdcm_read_JPEG_file (void * image_buffer);   
-  
+   bool gdcm_read_JPEG_file     (FILE *fp,void * image_buffer); // For JPEG 8 Bits
+   bool gdcm_read_JPEG_file12   (FILE *fp,void * image_buffer); // For JPEG 12 Bits
+   bool gdcm_read_JPEG2000_file (FILE *fp,void * image_buffer); // For JPEG 2000 (TODO)
+
+// For Run Length Encoding (TOCHECK)
+   bool gdcm_read_RLE_file      (FILE *fp,void * image_buffer); 
+
+     
 protected:
    int WriteBase(std::string FileName, FileType type);
+
 public:
+   gdcmFile(gdcmHeader *header);
    gdcmFile(std::string & filename);
    gdcmFile(const char * filename);
+   virtual ~gdcmFile(void);
        
+   gdcmHeader *GetHeader(void);
+
        // For promotion (performs a deepcopy of pointed header object)
        // TODO Swig gdcmFile(gdcmHeader* header);
        // TODO Swig ~gdcmFile();
@@ -40,8 +58,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
@@ -51,7 +72,6 @@ public:
    int SetImageData     (void * Data, size_t ExpectedSize);
       // When the caller is aware we simply point to the data:
       // TODO int SetImageDataNoCopy (void * Data, size_t ExpectedSize);
-   void SetImageDataSize (size_t ExpectedSize);
        
        // Push to disk.
        // A NE PAS OUBLIER : que fait-on en cas de Transfert Syntax (dans l'entete)
@@ -62,11 +82,13 @@ public:
        // Aucun test n'est fait sur l'"Endiannerie" du processeur.
        // Ca sera à l'utilisateur d'appeler son Reader correctement
                
-   int WriteRawData  (std::string nomFichier);
-   int WriteDcmImplVR(std::string nomFichier);
-   int WriteDcmImplVR(const char * nomFichier);
-   int WriteDcmExplVR(std::string nomFichier);
-   int WriteAcr      (std::string nomFichier);
+   int WriteRawData  (std::string fileName);
+   int WriteDcmImplVR(std::string fileName);
+   int WriteDcmImplVR(const char * fileName);
+   int WriteDcmExplVR(std::string fileName);
+   int WriteAcr      (std::string fileName);
+   
+   bool ParsePixelData(void);
 };
 
 #endif