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 d7857acbe1652e8ce364fe1acd32c5fc35fd82f0..81230ef96d837ce82a2ddd55ef3de33013908b7c 100644 (file)
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -1,7 +1,23 @@
-// gdcmBinEntry.cxx
-//-----------------------------------------------------------------------------
-//
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmBinEntry.cxx,v $
+  Language:  C++
+  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
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmBinEntry.h"
+#include "gdcmDebug.h"
 
 
 //-----------------------------------------------------------------------------
@@ -10,26 +26,78 @@
 /**
  * \brief   Constructor from a given gdcmBinEntry
  */
-gdcmBinEntry::gdcmBinEntry() : gdcmValEntry() {
+gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e)
+{
+   this->voidArea = NULL;
+}
 
+/**
+ * \brief   Constructor from a given gdcmBinEntry
+ * @param   e Pointer to existing Doc entry
+ */
+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();
+
+   this->voidArea = NULL; // let's be carefull !
 }
 
 /**
  * \brief   Canonical destructor.
  */
 gdcmBinEntry::~gdcmBinEntry(){
-   free (voidArea);
+   if (voidArea)
+      free (voidArea);
 }
 
 
 //-----------------------------------------------------------------------------
 // Print
 /*
- * \ingroup gdcmDocEntry
  * \brief   canonical Printer
  */
  
+void gdcmBinEntry::Print(std::ostream &os)
+{
+   gdcmDocEntry::Print(os);
+   std::ostringstream s;
+   void *voidArea = GetVoidArea();
+   if (voidArea != NULL)
+   {
+      s << " [gdcm::Binary data loaded with length is "
+        << GetLength() << "]";
+   }
+   else
+   {
+      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