X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.h;h=11c046db913f98dea214b0a1ec3b95e9b9cf790f;hb=27c61aa23c3f02def28d44dca855e54d9adb25a1;hp=fb2cbc419563d31fda18f0a7663c00f092b9a5cc;hpb=5a6910a313a526514242a21b868c7186fca14168;p=gdcm.git

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index fb2cbc41..11c046db 100644
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -1,43 +1,19 @@
 // gdcmFile.h
-
+//-----------------------------------------------------------------------------
 #ifndef GDCMFILE_H
 #define GDCMFILE_H
 
 #include "gdcmCommon.h"
 #include "gdcmHeader.h"
 
+//-----------------------------------------------------------------------------
 /*
  * In addition to Dicom header exploration, this class is designed
  * for accessing the image/volume content. One can also use it to
- * write Dicom files.
+ * write Dicom/ACR-NEMA/RAW files.
  */
 class GDCM_EXPORT gdcmFile
 {
-private:
-   gdcmHeader *Header;   // Header to use to load the file
-   bool SelfHeader;
-
-   void* PixelData;
-   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);
-   
-   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:
-   bool WriteBase(std::string FileName, FileType type);
-
 public:
    gdcmFile(gdcmHeader *header);
    gdcmFile(std::string & filename);
@@ -58,6 +34,7 @@ public:
    void   SetPixelDataSizeFromHeader(void);
    size_t GetImageDataSize();
    size_t GetImageDataSizeRaw();
+
    void * GetImageData();
    size_t GetImageDataIntoVector(void* destination, size_t MaxSize);
    void * GetImageDataRaw();
@@ -79,17 +56,53 @@ public:
 	// 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
-		
+   // Write pixels of ONE image on hard drive
+   // No test is made on processor "endianity"
+   // The user must call his reader correctly
    bool WriteRawData  (std::string fileName);
    bool WriteDcmImplVR(std::string fileName);
    bool WriteDcmImplVR(const char * fileName);
    bool WriteDcmExplVR(std::string fileName);
    bool WriteAcr      (std::string fileName);
-   
+ 
+   // Body in file gdcmParse.cxx
    bool ParsePixelData(void);
+     
+protected:
+   bool WriteBase(std::string FileName, FileType type);
+
+private:
+   void SwapZone(void* im, int swap, int lgr, int nb);
+   
+   bool ReadPixelData(void * destination);
+   
+   // For JPEG 8 Bits, body in file gdcmJpeg.cxx
+   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)
+   bool gdcm_read_RLE_file      (FILE *fp,void * image_buffer); 
+
+// Variables
+   gdcmHeader *Header;   // Header to use to load the file
+   bool SelfHeader;
+
+   void* PixelData;
+   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 PixelRead;     // ==1  if GetImageDataRaw was used
+                      // ==0  if GetImageData    was used
+                      // ==-1 if ImageData never read.
+
+   int Parsed;               // weather already parsed
+   std::string OrigFileName; // To avoid file overwrite   
 };
 
+//-----------------------------------------------------------------------------
 #endif