Program: gdcm
Module: $RCSfile: gdcmBinEntry.cxx,v $
Language: C++
- Date: $Date: 2004/10/12 04:35:44 $
- Version: $Revision: 1.33 $
+ Date: $Date: 2005/01/06 20:03:26 $
+ Version: $Revision: 1.43 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmBinEntry.h"
#include "gdcmDebug.h"
+#include <fstream>
+#include <iostream> // for std::ios_base, since <ios> does not exist on gcc/Solaris
namespace gdcm
{
/**
* \brief Constructor from a given BinEntry
*/
-BinEntry::BinEntry(DictEntry* e) : ValEntry(e)
+BinEntry::BinEntry(DictEntry *e) : ValEntry(e)
{
BinArea = 0;
+ SelfArea = true;
}
/**
* \brief Constructor from a given BinEntry
* @param e Pointer to existing Doc entry
*/
-BinEntry::BinEntry(DocEntry* e) : ValEntry(e->GetDictEntry())
+BinEntry::BinEntry(DocEntry *e) : ValEntry(e->GetDictEntry())
{
UsableLength = e->GetLength();
ReadLength = e->GetReadLength();
ImplicitVR = e->IsImplicitVR();
Offset = e->GetOffset();
- PrintLevel = e->GetPrintLevel();
//FIXME
//SQDepthLevel = e->GetDepthLevel();
BinArea = 0; // let's be carefull !
+ SelfArea = true;
}
/**
*/
BinEntry::~BinEntry()
{
- if (BinArea)
+ if (BinArea && SelfArea)
{
delete[] BinArea;
BinArea = 0; // let's be carefull !
void BinEntry::Print(std::ostream &os)
{
+ os << "B ";
DocEntry::Print(os);
std::ostringstream s;
void* binArea = GetBinArea();
* @param fp already open file pointer
* @param filetype type of the file to be written
*/
-void BinEntry::Write(FILE* 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)
{
// there is a 'non string' LUT, overlay, etc
- fwrite ( binArea,(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
- fseek(fp,(size_t)lgr,SEEK_CUR);
+ fp->seekp(lgr, std::ios::cur);
}
}
//-----------------------------------------------------------------------------
/// \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;
+
+ BinArea = area;
+ SelfArea=self;
}
//-----------------------------------------------------------------------------