ENH: Minor cleanups + ShowDicom now reread a written image

[gdcm.git] / src / gdcmFile.h

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index a8926b72541d8532428b8218e0eca0964893d487..be828e5ecafdb9f600da74a22c23661f897f0e5d 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/07/02 13:55:28 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2004/07/16 15:18:05 $
+  Version:   $Revision: 1.38 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -47,9 +47,9 @@ public:
    size_t GetImageDataSizeRaw();
 
    void * GetImageData();
-   size_t GetImageDataIntoVector(void* destination, size_t MaxSize);
+   size_t GetImageDataIntoVector(void* destination, size_t maxSize);
    void * GetImageDataRaw();
-   size_t GetImageDataIntoVectorRaw(void* destination, size_t MaxSize);
+   size_t GetImageDataIntoVectorRaw(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
@@ -58,7 +58,7 @@ public:
       // e.g. VTK) before calling the Write
       
    // voir gdcmHeader::SetImageDataSize ?!?         
-   bool SetImageData     (void * Data, size_t ExpectedSize);
+   bool SetImageData (void * data, size_t expectedSize);
 
    /// \todo When the caller is aware we simply point to the data:
    /// int SetImageDataNoCopy (void * Data, size_t ExpectedSize);
@@ -78,12 +78,12 @@ public:
    virtual bool SetEntryByNumber(std::string const & content,
                                  uint16_t group, uint16_t element)
    { 
-      GetHeader()->SetEntryByNumber(content,group,element);
-      return true;  /// \todo default behavior ?
+      Header->SetEntryByNumber(content,group,element);
+      return true;
    }
      
 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);
@@ -91,16 +91,16 @@ private:
    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_read_JPEG_file     (FILE *fp, void * image_buffer); 
    static int gdcm_read_RLE_fragment(char **areaToRead, long lengthToDecode, 
-                                     long uncompressedSegmentSize,FILE *fp);
+                                     long uncompressedSegmentSize, FILE *fp);
    // For JPEG 12 Bits, body in file gdcmJpeg12.cxx
-   bool gdcm_read_JPEG_file12   (FILE *fp,void * image_buffer);
+   bool gdcm_read_JPEG_file12   (FILE *fp, void* image_buffer);
    // 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 (TOCHECK)
-   bool gdcm_read_RLE_file      (FILE *fp,void * image_buffer); 
+   bool gdcm_read_RLE_file      (FILE *fp, void* image_buffer); 
 
 // Variables