ENH: Some fixes for gdcm installation

[gdcm.git] / src / gdcmBinEntry.cxx

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index a010ff7217f4cd08d523ad3df22729ae78b87da2..f336472c5e7e6afd515bcadb808862fb3cc95d7e 100644 (file)
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/09/13 12:10:53 $
-  Version:   $Revision: 1.26 $
+  Date:      $Date: 2004/09/27 08:39:05 $
+  Version:   $Revision: 1.32 $
                                                                                 
   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
@@ -28,7 +28,7 @@
  */
 gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e)
 {
-   VoidArea = 0;
+   BinArea = 0;
 }
 
 /**
@@ -45,7 +45,7 @@ gdcmBinEntry::gdcmBinEntry(gdcmDocEntry* e) : gdcmValEntry(e->GetDictEntry())
    //FIXME
    //SQDepthLevel = e->GetDepthLevel();
 
-   VoidArea = 0; // let's be carefull !
+   BinArea = 0; // let's be carefull !
 }
 
 /**
@@ -53,10 +53,10 @@ gdcmBinEntry::gdcmBinEntry(gdcmDocEntry* e) : gdcmValEntry(e->GetDictEntry())
  */
 gdcmBinEntry::~gdcmBinEntry()
 {
-   if (VoidArea)
+   if (BinArea)
    {
-      free (VoidArea);
-      VoidArea = 0; // let's be carefull !
+      delete[] BinArea;
+      BinArea = 0; // let's be carefull !
    }
 }
 
@@ -71,8 +71,8 @@ void gdcmBinEntry::Print(std::ostream &os)
 {
    gdcmDocEntry::Print(os);
    std::ostringstream s;
-   void *voidArea = GetVoidArea();
-   if (voidArea)
+   void* binArea = GetBinArea();
+   if (binArea)
    {
       //s << " [" << GDCM_BINLOADED 
       s << " [" << GetValue()
@@ -99,15 +99,15 @@ void gdcmBinEntry::Print(std::ostream &os)
  * @param fp already open file pointer
  * @param filetype type of the file to be written
 */
-void gdcmBinEntry::Write(FILE *fp, FileType filetype)
+void gdcmBinEntry::Write(FILE* fp, FileType filetype)
 {
    gdcmDocEntry::Write(fp, filetype);
-   void *voidArea = GetVoidArea();
+   void* binArea = GetBinArea();
    int lgr = GetLength();
-   if (voidArea)
+   if (binArea)
    {
       // there is a 'non string' LUT, overlay, etc
-      fwrite ( voidArea,(size_t)lgr ,(size_t)1 ,fp); // Elem value
+      fwrite ( binArea,(size_t)lgr ,(size_t)1 ,fp); // Elem value
    }
    else
    {
@@ -120,11 +120,11 @@ void gdcmBinEntry::Write(FILE *fp, FileType filetype)
 
 
 /// \brief Sets the value (non string) of the current Dicom Header Entry
-void gdcmBinEntry::SetVoidArea( void* area )  
+void gdcmBinEntry::SetBinArea( uint8_t* area )  
 { 
-   if (VoidArea)
-      free(VoidArea);
-   VoidArea = area;  
+   if (BinArea)
+      delete[] BinArea;
+   BinArea = area;  
 }
 
 //-----------------------------------------------------------------------------