X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmBinEntry.cxx;h=de10fd2a9d84fb6e6ad0191ac489d75f7d29f90a;hb=ab62b1a706df8e2ab1fbf26fa5037d6c22293655;hp=e57f5dfbc7e9c5f0c206fdbfb73133a5cb64ce33;hpb=65f457a97152fce4878d7aa20ec02f4ccda20705;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index e57f5dfb..de10fd2a 100644
--- 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/23 15:01:57 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2004/08/01 03:20:23 $
+  Version:   $Revision: 1.21 $
                                                                                 
   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(){
+gdcmBinEntry::~gdcmBinEntry()
+{
    if (voidArea)
+   {
       free (voidArea);
+      voidArea = NULL; // let's be carefull !
+   }
 }
 
 
@@ -66,14 +70,23 @@ void gdcmBinEntry::Print(std::ostream &os)
 {
    gdcmDocEntry::Print(os);
    std::ostringstream s;
-   if (voidArea != NULL)
+   void *voidArea = GetVoidArea();
+   if (voidArea)
    {
       s << " [gdcm::Binary data loaded with length is "
         << GetLength() << "]";
    }
    else
    {
-      s << " [gdcm::Binary data NOT loaded]";
+      if ( GetLength() == 0 )
+      {
+         s << " []";
+      }
+      else 
+      {
+         s << " [gdcm::Binary data NOT loaded]";
+      }
+         
    }
    os << s.str();
 }
@@ -81,15 +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