ENH: Solve problem with Theralys images

[gdcm.git] / src / gdcmFile.h

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 632d558035e8ce56317ade441d205b4a338f1078..8491fb5297529cbed7b169a95621856092e1790e 100644 (file)
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/22 03:05:41 $
-  Version:   $Revision: 1.65 $
+  Date:      $Date: 2004/10/28 03:10:58 $
+  Version:   $Revision: 1.68 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -25,7 +25,6 @@
 
 namespace gdcm 
 {
-
 //-----------------------------------------------------------------------------
 /*
  * In addition to Dicom header exploration, this class is designed
@@ -43,28 +42,22 @@ public:
    /// Accessor to \ref Header
    Header* GetHeader() { return HeaderInternal; }
 
-   int ComputeDecompressedPixelDataSizeFromHeader();
-
    /// Accessor to \ref ImageDataSize
-   size_t GetImageDataSize(){ return ImageDataSize; };
+   size_t GetImageDataSize() { return ImageDataSize; };
 
    /// Accessor to \ref ImageDataSizeRaw
-   size_t GetImageDataSizeRaw(){ return ImageDataSizeRaw; };
+   size_t GetImageDataSizeRaw() { return ImageDataSizeRaw; };
 
    /// Accessor to \ref PixelConverter
-   PixelConvert* GetPixelConverter(){ return PixelConverter; };
+   PixelConvert* GetPixelConverter() { return PixelConverter; };
 
    uint8_t* GetImageData();
    size_t GetImageDataIntoVector(void* destination, size_t maxSize);
    uint8_t* GetImageDataRaw();
-   void GetImageDataIntoVectorRaw(void* destination, size_t maxSize);
 
    // see also Header::SetImageDataSize ?!?         
    bool SetImageData (uint8_t* data, size_t expectedSize);
 
-   /// \todo When the caller is aware we simply point to the data:
-   /// int SetImageDataNoCopy (void* Data, size_t ExpectedSize);
-
    // Write pixels of ONE image on hard drive
    // No test is made on processor "endianity"
    // The user must call his reader correctly
@@ -90,6 +83,8 @@ private:
    void SaveInitialValues();    // will belong to the future PixelData class
    void RestoreInitialValues(); // will belong to the future PixelData class
    void DeleteInitialValues();  // will belong to the future PixelData class 
+   uint8_t* GetDecompressed();
+   int ComputeDecompressedPixelDataSizeFromHeader();
 
 private:
 // members variables: