X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmFile.h;h=53062b89b8745ed1e0edbb24fa75d2b4feb2a7fd;hb=edfc14dd195f9759cf02da0959d96d1499d572be;hp=8ed3171fe7af2834b8a043b1027ff2f5967c604a;hpb=c42ce41966ee7a572752d7f45ddff25b90515119;p=gdcm.git

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 8ed3171f..53062b89 100644
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/24 10:23:47 $
-  Version:   $Revision: 1.74 $
+  Date:      $Date: 2004/11/30 14:17:52 $
+  Version:   $Revision: 1.79 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -58,20 +58,16 @@ public:
    /// Accessor to \ref Header
    Header* GetHeader() { return HeaderInternal; }
 
-   /// Accessor to \ref ImageDataSize
-   size_t GetImageDataSize() { return ImageDataSize; };
-
-   /// Accessor to \ref ImageDataSizeRaw
-   size_t GetImageDataSizeRaw() { return ImageDataSizeRaw; };
+   size_t GetImageDataSize();
+   size_t GetImageDataRawSize();
 
    /// Accessor to \ref PixelConverter
    PixelConvert* GetPixelConverter() { return PixelConverter; };
 
    uint8_t* GetImageData();
-   size_t GetImageDataIntoVector(void* destination, size_t maxSize);
    uint8_t* GetImageDataRaw();
+   size_t GetImageDataIntoVector(void* destination, size_t maxSize);
 
-   // see also Header::SetImageDataSize ?!?         
    bool SetImageData (uint8_t* data, size_t expectedSize);
 
    // Write pixels of ONE image on hard drive
@@ -107,14 +103,21 @@ public:
 
 protected:
    bool WriteBase(std::string const& fileName, FileType type);
+   bool CheckWriteIntegrity();
 
    void SetWriteToNative();
    void SetWriteToDecompressed();
    void SetWriteToRGB();
    void RestoreWrite();
 
+   void SetWriteFileTypeToACR();
+   void SetWriteFileTypeToExplicitVR();
+   void SetWriteFileTypeToImplicitVR();
+   void RestoreWriteFileType();
+
    void SetWriteToLibido();
-   void RestoreWriteFromLibido();
+   void SetWriteToNoLibido();
+   void RestoreWriteOfLibido();
 
    ValEntry* CopyValEntry(uint16_t group,uint16_t element);
    BinEntry* CopyBinEntry(uint16_t group,uint16_t element);
@@ -122,13 +125,10 @@ protected:
 private:
    void Initialise();
 
-   void SaveInitialValues();    // will belong to the future PixelData class
    uint8_t* GetDecompressed();
    int ComputeDecompressedPixelDataSizeFromHeader();
 
 private:
-   void SetPixelData(uint8_t* data);
-
 // members variables:
 
    /// Header to use to load the file
@@ -159,11 +159,6 @@ private:
    /// \brief to hold the Pixels (when read)
    uint8_t* Pixel_Data;  // (was PixelData)
    
-   /// \brief Size (in bytes) of required memory to hold the Gray Level pixels
-   ///        represented in this file. This is used when the user DOESN'T want
-   ///        the RGB pixels image when it's stored as a PALETTE COLOR image
-   size_t ImageDataSizeRaw;
-   
    /// \brief Size (in bytes) of requited memory to hold the the pixels
    ///        of this image in it's RGB convertion either from:
    ///        - Plane R, Plane G, Plane B 
@@ -171,14 +166,9 @@ private:
    ///        - YBR Pixels (or from RGB Pixels, as well) 
    size_t ImageDataSize;
        
-  /// \brief ==1  if GetImageDataRaw was used
-  ///        ==0  if GetImageData    was used
-  ///        ==-1 if ImageData never read                       
-   int PixelRead;
-
 //
 // --------------- end of future PixelData class
-//  
+// 
 
 };
 } // end namespace gdcm