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 aca20db63551838859222ae84214443dfb212958..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/21 12:38:28 $
-  Version:   $Revision: 1.12 $
+  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,21 +64,40 @@ gdcmBinEntry::~gdcmBinEntry(){
  
 void gdcmBinEntry::Print(std::ostream &os)
 {
-   gdcmValEntry::Print(os);
+   gdcmDocEntry::Print(os);
    std::ostringstream s;
+   void *voidArea = GetVoidArea();
    if (voidArea != NULL)
    {
-      s << " [gdcm::Binary data loaded with lenght is "
-        << GetLength() << "]"
-        << std::endl;
+      s << " [gdcm::Binary data loaded with length is "
+        << GetLength() << "]";
    }
    else
    {
-      s << " [gdcm::Binary data NOT loaded]"
-        << std::endl;
+      if ( GetLength() == 0 )
+         s << " []";
+      else 
+      {
+         s << " [gdcm::Binary data NOT loaded]";
+      }
+         
    }
    os << s.str();
 }
+
+/*
+ * \brief   canonical Writer
+ */
+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
+      fwrite ( voidArea,(size_t)lgr ,(size_t)1 ,fp); // Elem value
+      return;            
+   } 
+}
 //-----------------------------------------------------------------------------
 // Public