FIX: CV++

[gdcm.git] / src / gdcmFile.h

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 6bcd20673ec6a344c3f8969291b580efcb0e2091..0336584f88c4797e705bc896c7c0683e72bf0a06 100644 (file)
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -14,17 +14,27 @@
 class GDCM_EXPORT gdcmFile: public gdcmHeader
 {
 private:
-       void* PixelData;
-       size_t lgrTotale;
-       int Parsed;          // weather allready parsed
+   void* PixelData;
+   size_t lgrTotale;
+   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); // For JPEG 8 Bits
+   int gdcm_read_JPEG_file12   (void * image_buffer); // For JPEG 12 Bits
+   int gdcm_read_JPEG2000_file (void * image_buffer); // For JPEG 2000 (TODO)
+
+// For Run Length Encoding (TOCHECK)
+   int gdcm_read_RLE_file      (void * image_buffer); 
+
+     
 protected:
    int WriteBase(std::string FileName, FileType type);
 public:
-       gdcmFile(std::string & filename);
-       gdcmFile(const char * filename);
+   gdcmFile(std::string & filename);
+   gdcmFile(const char * filename);
        
        // For promotion (performs a deepcopy of pointed header object)
        // TODO Swig gdcmFile(gdcmHeader* header);
@@ -32,38 +42,40 @@ public:
 
        // On writing purposes. When instance was created through
        // gdcmFile(std::string filename) then the filename argument MUST be
-   // different from the constructor's one (no overwriting allowed).
+        // different from the constructor's one (no overwriting allowed).
        // TODO Swig int SetFileName(std::string filename);
 
    void   SetPixelDataSizeFromHeader(void);
-       size_t GetImageDataSize();
-       void * GetImageData();
-       size_t GetImageDataIntoVector(void* destination, size_t MaxSize );
+   size_t GetImageDataSize();
+   void * GetImageData();
+   size_t GetImageDataIntoVector(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
-       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);
+      // 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
+   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)
-       // incohérente avec l'ordre des octets en mémoire  
+       // incohérente avec l'ordre des octets en mémoire ? 
        // TODO Swig int Write();
        
        // Ecrit sur disque les pixels d'UNE image
        // 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