X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.h;h=e9bf7081b0321b3c8ff4516253f3469f294095a2;hb=5fbee0c35cc0f02ceea5d5a8be0c1900c63143bb;hp=b81587600ed500b90f84b91217bed357c4ca7bc8;hpb=4a0c2407ec81e041c2e43781acec4c78c83fc487;p=gdcm.git

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index b8158760..e9bf7081 100644
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -14,64 +14,59 @@
 class GDCM_EXPORT gdcmFile: public gdcmHeader
 {
 private:
-	void* PixelData;
-	size_t lgrTotale;
-	int Parsed;          // weather allready parsed
-	string OrigFileName; // To avoid file overwrite
+   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);   
+  
 protected:
-   int WriteBase(string FileName, FileType type);
+   int WriteBase(std::string FileName, FileType type);
 public:
-	gdcmFile(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);
 	// TODO Swig ~gdcmFile();
 
 	// On writing purposes. When instance was created through
-	// gdcmFile(string filename) then the filename argument MUST be different
-	// from the constructor's one (no overwriting allowed).
-	// TODO Swig int SetFileName(string filename);
+	// gdcmFile(std::string filename) then the filename argument MUST be
+        // different from the constructor's one (no overwriting allowed).
+	// TODO Swig int SetFileName(std::string filename);
 
-   void SetPixelDataSizeFromHeader(void);
-	// Returns size (in bytes) of required memory to contain data
-	// represented in this file.
-	size_t GetImageDataSize();
+   void   SetPixelDataSizeFromHeader(void);
+   size_t GetImageDataSize();
+   void * GetImageData();
+   size_t GetImageDataIntoVector(void* destination, size_t MaxSize );
 	
-	// Allocates necessary memory, copies the data (image[s]/volume[s]) to
-	// newly allocated zone and return a pointer to it:
-	 void * GetImageData();
-	
-	// Copies (at most MaxSize bytes) of data to caller's memory space.
-	// Returns an error code on failure (if MaxSize is not big enough)
-	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 	(string nomFichier);
-	int WriteDcmImplVR(string nomFichier);
-	int WriteDcmImplVR(const char * nomFichier);
-	int WriteDcmExplVR(string nomFichier);
-	int WriteAcr     	(string nomFichier);
+   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);
 };
 
 #endif