BUG: very same bug when using char* instead of string

[gdcm.git] / src / gdcmBinEntry.cxx

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index f5dddb09b1e3e0dee9168f51ea7c525f542a6cd8..81230ef96d837ce82a2ddd55ef3de33013908b7c 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:47:33 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2004/06/25 12:58:24 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -64,20 +64,23 @@ 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;
+   void *voidArea = GetVoidArea();
    if (voidArea != NULL)
    {
       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();
 }
@@ -86,6 +89,7 @@ void gdcmBinEntry::Print(std::ostream &os)
  * \brief   canonical Writer
  */
 void gdcmBinEntry::Write(FILE *fp, FileType filetype) {
+   gdcmDocEntry::Write(fp, filetype);
    void *voidArea = GetVoidArea();
    int lgr=GetLength();
    if (voidArea != NULL)