* src/gdcmDocEntrySet.[h|cxx], gdcmDocument.[h|cxx] : amelioration of

[gdcm.git] / src / gdcmBinEntry.cxx

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index d0301c5e0ef8a71ff42e26125fd298788c7f3d5c..991d3a0149e05728575e31fdc384f668faf332a0 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/11/16 16:20:23 $
-  Version:   $Revision: 1.37 $
+  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 
 {
@@ -45,7 +46,6 @@ BinEntry::BinEntry(DocEntry* e) : ValEntry(e->GetDictEntry())
    ReadLength   = e->GetReadLength();
    ImplicitVR   = e->IsImplicitVR();
    Offset       = e->GetOffset();
-   PrintLevel   = e->GetPrintLevel();
    //FIXME
    //SQDepthLevel = e->GetDepthLevel();
 
@@ -74,6 +74,7 @@ BinEntry::~BinEntry()
  
 void BinEntry::Print(std::ostream &os)
 {
+   os << "B ";
    DocEntry::Print(os);
    std::ostringstream s;
    void* binArea = GetBinArea();
@@ -104,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)
@@ -119,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);
    }
 }
 //-----------------------------------------------------------------------------