* src/*.cxx *.h Reference to License.htm fixed to License.html.

[gdcm.git] / src / gdcmFile.h

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index a1558cf2d5b41ce94b0b5afa541d897049c8bf2f..837b2d00c7c4b6b2516151cedc0d66803116a8e7 100644 (file)
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.h,v $
   Language:  C++
-  Date:      $Date: 2004/09/20 18:14:23 $
-  Version:   $Revision: 1.49 $
+  Date:      $Date: 2004/09/27 08:39:07 $
+  Version:   $Revision: 1.52 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -32,7 +32,7 @@ class GDCM_EXPORT gdcmFile
 {
 public:
    gdcmFile( gdcmHeader *header );
-   gdcmFile( std::string const & filename );
+   gdcmFile( std::string const& filename );
  
    virtual ~gdcmFile();
 
@@ -53,9 +53,9 @@ public:
 ///            -the (vtk) user is supposed to know how to deal with LUTs-     
    size_t GetImageDataSizeRaw(){ return ImageDataSizeRaw; };
 
-   void * GetImageData();
+   uint8_t* GetImageData();
    size_t GetImageDataIntoVector(void* destination, size_t maxSize);
-   void * GetImageDataRaw();
+   uint8_t* GetImageDataRaw();
    size_t GetImageDataIntoVectorRaw(void* destination, size_t maxSize);
 
    // Allocates ExpectedSize bytes of memory at this->Data and copies the
@@ -65,24 +65,24 @@ public:
    // e.g. VTK) before calling the Write
       
    // see also gdcmHeader::SetImageDataSize ?!?         
-   bool SetImageData (void * data, size_t expectedSize);
+   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);
+   /// 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
-   bool WriteRawData  (std::string const & fileName);
-   bool WriteDcmImplVR(std::string const & fileName);
-   bool WriteDcmExplVR(std::string const & fileName);
-   bool WriteAcr      (std::string const & fileName);
+   bool WriteRawData  (std::string const& fileName);
+   bool WriteDcmImplVR(std::string const& fileName);
+   bool WriteDcmExplVR(std::string const& fileName);
+   bool WriteAcr      (std::string const& fileName);
 
    // Don't look any longer for the code : 
    // It's in file gdcmParsePixels.cxx
    bool ParsePixelData();
 
-   virtual bool SetEntryByNumber(std::string const & content,
+   virtual bool SetEntryByNumber(std::string const& content,
                                  uint16_t group, uint16_t element)
    { 
       Header->SetEntryByNumber(content,group,element);
@@ -90,36 +90,36 @@ public:
    }
      
 protected:
-   bool WriteBase(std::string const & fileName, FileType type);
+   bool WriteBase(std::string const& fileName, FileType type);
 
 private:
    void SwapZone(void* im, int swap, int lgr, int nb);
 
-   bool ReadPixelData(void * destination);
+   bool ReadPixelData(void* destination);
    
    // For JPEG 8 Bits, body in file gdcmJpeg.cxx
-   bool gdcm_read_JPEG_file     (FILE *fp, void * image_buffer); 
-   bool gdcm_write_JPEG_file    (FILE *fp, void * image_buffer, 
+   bool gdcm_read_JPEG_file     (FILE* fp, void* image_buffer); 
+   bool gdcm_write_JPEG_file    (FILE* fp, void* image_buffer, 
                                  int image_width, int image_heigh,
                                  int quality);
 
    // For JPEG 12 Bits, body in file gdcmJpeg12.cxx
-   bool gdcm_read_JPEG_file12   (FILE *fp, void* image_buffer);
-   bool gdcm_write_JPEG_file12  (FILE *fp, void* image_buffer, 
+   bool gdcm_read_JPEG_file12   (FILE* fp, void* image_buffer);
+   bool gdcm_write_JPEG_file12  (FILE* fp, void* image_buffer, 
                                  int image_width, int image_height,
                                  int quality);
 
    // For JPEG 2000, body in file gdcmJpeg2000.cxx
-   bool gdcm_read_JPEG2000_file (FILE *fp, void* image_buffer);
+   bool gdcm_read_JPEG2000_file (FILE* fp, void* image_buffer);
 
    // For Run Length Encoding
-   bool gdcm_read_RLE_file      (FILE *fp, void* image_buffer);
+   bool gdcm_read_RLE_file      (FILE* fp, void* image_buffer);
 // FIXME : *sure* it's NOT static (C++)
 // (would be static in C, or embedded in ADA)
 // It's NOT a method, but a not user intended fonction.
 // How do we write that in C++ ?)
    static int gdcm_read_RLE_fragment(char **areaToRead, long lengthToDecode, 
-                                     long uncompressedSegmentSize, FILE *fp);
+                                     long uncompressedSegmentSize, FILE* fp);
 
    void SaveInitialValues();    // will belong to the future gdcmPixelData class
    void RestoreInitialValues(); // will belong to the future gdcmPixelData class
@@ -143,7 +143,7 @@ private:
    //
 
    /// \brief to hold the Pixels (when read)
-   void* Pixel_Data;  // (was PixelData)
+   uint8_t* Pixel_Data;  // (was PixelData)
    
    /// \brief Area length to receive the Gray Level pixels
    size_t ImageDataSizeRaw;