* src/gdcmDocument.[cxx|h] : fix memory leaks. The return is suppressed

[gdcm.git] / src / gdcmBinEntry.cxx

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index de10fd2a9d84fb6e6ad0191ac489d75f7d29f90a..22dbae3ca4d48ae2f19db5d7d5b56784afdd925d 100644 (file)
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/01 03:20:23 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2004/11/15 16:12:30 $
+  Version:   $Revision: 1.36 $
                                                                                 
   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.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -18,44 +18,48 @@
 
 #include "gdcmBinEntry.h"
 #include "gdcmDebug.h"
+#include <fstream>
 
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 
 /**
- * \brief   Constructor from a given gdcmBinEntry
+ * \brief   Constructor from a given BinEntry
  */
-gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e)
+BinEntry::BinEntry(DictEntry* e) : ValEntry(e)
 {
-   voidArea = NULL;
+   BinArea = 0;
 }
 
 /**
- * \brief   Constructor from a given gdcmBinEntry
+ * \brief   Constructor from a given BinEntry
  * @param   e Pointer to existing Doc entry
  */
-gdcmBinEntry::gdcmBinEntry(gdcmDocEntry* e) : gdcmValEntry(e->GetDictEntry())
+BinEntry::BinEntry(DocEntry* e) : ValEntry(e->GetDictEntry())
 {
    UsableLength = e->GetLength();
    ReadLength   = e->GetReadLength();
    ImplicitVR   = e->IsImplicitVR();
    Offset       = e->GetOffset();
    PrintLevel   = e->GetPrintLevel();
-   SQDepthLevel = e->GetDepthLevel();
+   //FIXME
+   //SQDepthLevel = e->GetDepthLevel();
 
-   voidArea = NULL; // let's be carefull !
+   BinArea = 0; // let's be carefull !
 }
 
 /**
  * \brief   Canonical destructor.
  */
-gdcmBinEntry::~gdcmBinEntry()
+BinEntry::~BinEntry()
 {
-   if (voidArea)
+   if (BinArea)
    {
-      free (voidArea);
-      voidArea = NULL; // let's be carefull !
+      delete[] BinArea;
+      BinArea = 0; // let's be carefull !
    }
 }
 
@@ -66,15 +70,16 @@ gdcmBinEntry::~gdcmBinEntry()
  * \brief   canonical Printer
  */
  
-void gdcmBinEntry::Print(std::ostream &os)
+void BinEntry::Print(std::ostream &os)
 {
-   gdcmDocEntry::Print(os);
+   DocEntry::Print(os);
    std::ostringstream s;
-   void *voidArea = GetVoidArea();
-   if (voidArea)
+   void* binArea = GetBinArea();
+   if (binArea)
    {
-      s << " [gdcm::Binary data loaded with length is "
-        << GetLength() << "]";
+      //s << " [" << GDCM_BINLOADED 
+      s << " [" << GetValue()
+        << "; length = " << GetLength() << "]";
    }
    else
    {
@@ -84,7 +89,8 @@ void gdcmBinEntry::Print(std::ostream &os)
       }
       else 
       {
-         s << " [gdcm::Binary data NOT loaded]";
+         //s << " [gdcm::Binary data NOT loaded]";
+         s << " [" <<GetValue() << "]";
       }
          
    }
@@ -93,21 +99,39 @@ void gdcmBinEntry::Print(std::ostream &os)
 
 /*
  * \brief   canonical Writer
- */
-void gdcmBinEntry::Write(FILE *fp, FileType filetype)
+ * @param fp already open file pointer
+ * @param filetype type of the file to be written
+*/
+void BinEntry::Write(std::ofstream* fp, FileType filetype)
 {
-   gdcmDocEntry::Write(fp, filetype);
-   void *voidArea = GetVoidArea();
+   DocEntry::Write(fp, filetype);
+   void* binArea = GetBinArea();
    int lgr = GetLength();
-   if (voidArea)
+   if (binArea)
    {
       // there is a 'non string' LUT, overlay, etc
-      fwrite ( voidArea,(size_t)lgr ,(size_t)1 ,fp); // Elem value
+      fp->write ( (char*)binArea, lgr ); // Elem value
+      //assert( strlen((char*)binArea) == lgr );
+
+   }
+   else
+   {
+    // nothing was loaded, but we need to skip space on disc
+      fp->seekp(lgr, std::ios_base::cur);
    }
 }
 //-----------------------------------------------------------------------------
 // Public
 
+
+/// \brief Sets the value (non string) of the current Dicom Header Entry
+void BinEntry::SetBinArea( uint8_t* area )  
+{ 
+   if (BinArea)
+      delete[] BinArea;
+   BinArea = area;
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -115,3 +139,4 @@ void gdcmBinEntry::Write(FILE *fp, FileType filetype)
 // Private
    
 //-----------------------------------------------------------------------------
+} // end namespace gdcm