X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=991d3a0149e05728575e31fdc384f668faf332a0;hb=74e3bc05fade5a18f193e7d1122c74756c0e689e;hp=22dbae3ca4d48ae2f19db5d7d5b56784afdd925d;hpb=eb427dc05df82e0d814ea43533e7711ba35d189a;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 22dbae3c..991d3a01 100644
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/15 16:12:30 $
-  Version:   $Revision: 1.36 $
+  Date:      $Date: 2004/12/16 13:46:36 $
+  Version:   $Revision: 1.42 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,6 +19,7 @@
 #include "gdcmBinEntry.h"
 #include "gdcmDebug.h"
 #include <fstream>
+#include <iostream> // for std::ios_base, since <ios> does not exist on gcc/Solaris
 
 namespace gdcm 
 {
@@ -32,6 +33,7 @@ namespace gdcm
 BinEntry::BinEntry(DictEntry* e) : ValEntry(e)
 {
    BinArea = 0;
+   SelfArea = true;
 }
 
 /**
@@ -44,11 +46,11 @@ BinEntry::BinEntry(DocEntry* e) : ValEntry(e->GetDictEntry())
    ReadLength   = e->GetReadLength();
    ImplicitVR   = e->IsImplicitVR();
    Offset       = e->GetOffset();
-   PrintLevel   = e->GetPrintLevel();
    //FIXME
    //SQDepthLevel = e->GetDepthLevel();
 
    BinArea = 0; // let's be carefull !
+   SelfArea = true;
 }
 
 /**
@@ -56,7 +58,7 @@ BinEntry::BinEntry(DocEntry* e) : ValEntry(e->GetDictEntry())
  */
 BinEntry::~BinEntry()
 {
-   if (BinArea)
+   if (BinArea && SelfArea)
    {
       delete[] BinArea;
       BinArea = 0; // let's be carefull !
@@ -72,6 +74,7 @@ BinEntry::~BinEntry()
  
 void BinEntry::Print(std::ostream &os)
 {
+   os << "B ";
    DocEntry::Print(os);
    std::ostringstream s;
    void* binArea = GetBinArea();
@@ -102,9 +105,9 @@ void BinEntry::Print(std::ostream &os)
  * @param fp already open file pointer
  * @param filetype type of the file to be written
 */
-void BinEntry::Write(std::ofstream* fp, FileType filetype)
+void BinEntry::WriteContent(std::ofstream* fp, FileType filetype)
 {
-   DocEntry::Write(fp, filetype);
+   DocEntry::WriteContent(fp, filetype);
    void* binArea = GetBinArea();
    int lgr = GetLength();
    if (binArea)
@@ -117,7 +120,7 @@ void BinEntry::Write(std::ofstream* fp, FileType filetype)
    else
    {
     // nothing was loaded, but we need to skip space on disc
-      fp->seekp(lgr, std::ios_base::cur);
+      fp->seekp(lgr, std::ios::cur);
    }
 }
 //-----------------------------------------------------------------------------
@@ -125,11 +128,13 @@ void BinEntry::Write(std::ofstream* fp, FileType filetype)
 
 
 /// \brief Sets the value (non string) of the current Dicom Header Entry
-void BinEntry::SetBinArea( uint8_t* area )  
+void BinEntry::SetBinArea( uint8_t* area, bool self )  
 { 
-   if (BinArea)
+   if (BinArea && SelfArea)
       delete[] BinArea;
+
    BinArea = area;
+   SelfArea=self;
 }
 
 //-----------------------------------------------------------------------------