X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmBinEntry.cxx;h=ae4c5be868395906260f7a5a65a114f2a1d498bc;hb=16887ff26b068405a235a6a8a37f4e62516de393;hp=4498e27fa085d2360ef094f2216db385de5c758a;hpb=75262e67ec39ad2f359c1efbf9ee805819a8e58a;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 4498e27f..ae4c5be8 100644
--- 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/24 18:03:14 $
+  Version:   $Revision: 1.18 $
+                                                                                
+  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,22 +26,24 @@
 /**
  * \brief   Constructor from a given gdcmBinEntry
  */
-gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e) {
-
+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()){
+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->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 !
 }
 
@@ -33,20 +51,52 @@ gdcmBinEntry::gdcmBinEntry(gdcmDocEntry* e) : gdcmValEntry(e->GetDictEntry()){
  * \brief   Canonical destructor.
  */
 gdcmBinEntry::~gdcmBinEntry(){
-   free (voidArea);
+   if (voidArea)
+      free (voidArea);
 }
 
 
 //-----------------------------------------------------------------------------
 // Print
 /*
- * \ingroup gdcmDocEntry
  * \brief   canonical Printer
  */
  
-void gdcmBinEntry::Print(std::ostream &os) {
-   PrintCommonPart(os);
-   std::cout << " gdcmBinEntry : Print, so WHAT ?" <<std::endl;
+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