Header mismatch with cpp file: corrected

[gdcm.git] / src / gdcmFile.h

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index b81587600ed500b90f84b91217bed357c4ca7bc8..6bcd20673ec6a344c3f8969291b580efcb0e2091 100644 (file)
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -17,13 +17,13 @@ private:
        void* PixelData;
        size_t lgrTotale;
        int Parsed;          // weather allready parsed
-       string OrigFileName; // To avoid file overwrite
+   std::string OrigFileName; // To avoid file overwrite
    void SwapZone(void* im, int swap, int lgr, int nb);
    bool ReadPixelData(void * destination);
 protected:
-   int WriteBase(string FileName, FileType type);
+   int WriteBase(std::string FileName, FileType type);
 public:
-       gdcmFile(string & filename);
+       gdcmFile(std::string & filename);
        gdcmFile(const char * filename);
        
        // For promotion (performs a deepcopy of pointed header object)
@@ -31,21 +31,13 @@ public:
        // 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.
+   void   SetPixelDataSizeFromHeader(void);
        size_t GetImageDataSize();
-       
-       // 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)
+       void * GetImageData();
        size_t GetImageDataIntoVector(void* destination, size_t MaxSize );
        
        // Allocates ExpectedSize bytes of memory at this->Data and copies the
@@ -67,11 +59,11 @@ public:
        // 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 WriteRawData        (std::string nomFichier);
+       int WriteDcmImplVR(std::string nomFichier);
        int WriteDcmImplVR(const char * nomFichier);
-       int WriteDcmExplVR(string nomFichier);
-       int WriteAcr            (string nomFichier);
+       int WriteDcmExplVR(std::string nomFichier);
+       int WriteAcr            (std::string nomFichier);
 };
 
 #endif