ENH: Afterall a Dashboard on Win32 is usefull :)

[gdcm.git] / src / gdcmFile.cxx

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 75bdc905d5c1caf5b6d7d007a4ff8e269122e5d8..8c3cb2796cfa1c0f98e232571c47caffcd74e807 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/09/23 09:40:30 $
-  Version:   $Revision: 1.127 $
+  Date:      $Date: 2004/09/27 08:39:07 $
+  Version:   $Revision: 1.131 $
                                                                                 
   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
@@ -375,7 +375,7 @@ uint8_t* gdcmFile::GetImageData()
          GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel());
 
       // Will be 7fe0, 0010 in standard case
-      GetHeader()->SetEntryVoidAreaByNumber( Pixel_Data, 
+      GetHeader()->SetEntryBinAreaByNumber( Pixel_Data, 
          GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel()); 
    }      
    PixelRead = 0; // no PixelRaw
@@ -507,7 +507,7 @@ uint8_t* gdcmFile::GetImageDataRaw ()
          GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel());
  
       // will be 7fe0, 0010 in standard cases
-      GetHeader()->SetEntryVoidAreaByNumber(Pixel_Data, 
+      GetHeader()->SetEntryBinAreaByNumber(Pixel_Data, 
          GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel());
    } 
    PixelRead = 1; // PixelRaw
@@ -539,7 +539,7 @@ uint8_t* gdcmFile::GetImageDataRaw ()
  * @return  On success, the number of bytes actually copied. Zero on
  *          failure e.g. MaxSize is lower than necessary.
  */
-size_t gdcmFile::GetImageDataIntoVectorRaw (void *destination, size_t maxSize)
+size_t gdcmFile::GetImageDataIntoVectorRaw (void* destination, size_t maxSize)
 {
    int nb, nbu, highBit, sign;
 
@@ -665,14 +665,15 @@ size_t gdcmFile::GetImageDataIntoVectorRaw (void *destination, size_t maxSize)
          return 0;
       }
    }
-// DO NOT remove this code commented out.
-// Nobody knows what's expecting you ...
-// Just to 'see' what was actually read on disk :-(
-
-//   FILE * f2;
-//   f2 = fopen("SpuriousFile.RAW","wb");
-//   fwrite(destination,ImageDataSize,1,f2);
-//   fclose(f2);
+/// \todo
+/// DO NOT remove this code commented out.
+/// Nobody knows what's expecting you ...
+/// Just to 'see' what was actually read on disk :-(
+///
+///   FILE*  f2;
+///   f2 = fopen("SpuriousFile.RAW","wb");
+///   fwrite(destination,ImageDataSize,1,f2);
+///   fclose(f2);
 
    // Deal with the color
    // -------------------
@@ -844,7 +845,7 @@ bool gdcmFile::SetImageData(uint8_t* inData, size_t expectedSize)
 
 bool gdcmFile::WriteRawData(std::string const & fileName)
 {
-   FILE *fp1 = fopen(fileName.c_str(), "wb");
+   FILE* fp1 = fopen(fileName.c_str(), "wb");
    if (fp1 == NULL)
    {
       printf("Fail to open (write) file [%s] \n", fileName.c_str());
@@ -923,7 +924,7 @@ bool gdcmFile::WriteBase (std::string const & fileName, FileType type)
       return false;
    }
 
-   FILE *fp1 = fopen(fileName.c_str(), "wb");
+   FILE* fp1 = fopen(fileName.c_str(), "wb");
    if (fp1 == NULL)
    {
       printf("Failed to open (write) File [%s] \n", fileName.c_str());
@@ -1011,7 +1012,7 @@ bool gdcmFile::WriteBase (std::string const & fileName, FileType type)
  * @param   lgr Area Length
  * @param   nb Pixels Bit number 
  */
-void gdcmFile::SwapZone(void *im, int swap, int lgr, int nb)
+void gdcmFile::SwapZone(void* im, int swap, int lgr, int nb)
 {
    int i;
 
@@ -1093,9 +1094,9 @@ void gdcmFile::SwapZone(void *im, int swap, int lgr, int nb)
  * @param   destination where the pixel data should be stored.
  *
  */
-bool gdcmFile::ReadPixelData(void *destination) 
+bool gdcmFile::ReadPixelData(void* destination) 
 {
-   FILE *fp = Header->OpenFile();
+   FILE* fp = Header->OpenFile();
 
    if ( !fp )
    {