ENH: Fix a shadow variable

[gdcm.git] / src / gdcmBinEntry.cxx

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index b21eab91a8da7001538eec1a72649ab7001995ca..ef4f9652a9e15d54fb81badc6467b3c5849065e8 100644 (file)
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/22 13:56:08 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2004/08/16 16:30:32 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,7 +28,7 @@
  */
 gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e)
 {
-   this->voidArea = NULL;
+   VoidArea = NULL;
 }
 
 /**
@@ -37,22 +37,26 @@ gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e)
  */
 gdcmBinEntry::gdcmBinEntry(gdcmDocEntry* e) : gdcmValEntry(e->GetDictEntry())
 {
-   this->UsableLength = e->GetLength();
-   this->ReadLength   = e->GetReadLength();
-   this->ImplicitVR   = e->IsImplicitVR();
-   this->Offset       = e->GetOffset();
-   this->printLevel   = e->GetPrintLevel();
-   this->SQDepthLevel = e->GetDepthLevel();
+   UsableLength = e->GetLength();
+   ReadLength   = e->GetReadLength();
+   ImplicitVR   = e->IsImplicitVR();
+   Offset       = e->GetOffset();
+   PrintLevel   = e->GetPrintLevel();
+   SQDepthLevel = e->GetDepthLevel();
 
-   this->voidArea = NULL; // let's be carefull !
+   VoidArea = NULL; // let's be carefull !
 }
 
 /**
  * \brief   Canonical destructor.
  */
-gdcmBinEntry::~gdcmBinEntry(){
-   if (voidArea)
-      free (voidArea);
+gdcmBinEntry::~gdcmBinEntry()
+{
+   if (VoidArea)
+   {
+      free (VoidArea);
+      VoidArea = NULL; // let's be carefull !
+   }
 }
 
 
@@ -64,20 +68,25 @@ gdcmBinEntry::~gdcmBinEntry(){
  
 void gdcmBinEntry::Print(std::ostream &os)
 {
-   //gdcmValEntry::Print(os);  // replaced by PrintCommonPart 
-                               // to avoid bugging the display
-   PrintCommonPart(os);
+   gdcmDocEntry::Print(os);
    std::ostringstream s;
-   if (voidArea != NULL)
+   void *voidArea = GetVoidArea();
+   if (voidArea)
    {
       s << " [gdcm::Binary data loaded with length is "
-        << GetLength() << "]"
-        << std::endl;
+        << GetLength() << "]";
    }
    else
    {
-      s << " [gdcm::Binary data NOT loaded]"
-        << std::endl;
+      if ( GetLength() == 0 )
+      {
+         s << " []";
+      }
+      else 
+      {
+         s << " [gdcm::Binary data NOT loaded]";
+      }
+         
    }
    os << s.str();
 }
@@ -85,14 +94,16 @@ void gdcmBinEntry::Print(std::ostream &os)
 /*
  * \brief   canonical Writer
  */
-void gdcmBinEntry::Write(FILE *fp, FileType filetype) {
+void gdcmBinEntry::Write(FILE *fp, FileType filetype)
+{
+   gdcmDocEntry::Write(fp, filetype);
    void *voidArea = GetVoidArea();
-   int lgr=GetLength();
-   if (voidArea != NULL) 
-   { // there is a 'non string' LUT, overlay, etc
+   int lgr = GetLength();
+   if (voidArea)
+   {
+      // there is a 'non string' LUT, overlay, etc
       fwrite ( voidArea,(size_t)lgr ,(size_t)1 ,fp); // Elem value
-      return;            
-   } 
+   }
 }
 //-----------------------------------------------------------------------------
 // Public