Program: gdcm
Module: $RCSfile: gdcmBinEntry.cxx,v $
Language: C++
- Date: $Date: 2004/09/10 14:32:04 $
- Version: $Revision: 1.25 $
+ Date: $Date: 2004/11/24 16:39:18 $
+ Version: $Revision: 1.38 $
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
#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;
+ SelfArea = true;
}
/**
- * \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 = 0; // let's be carefull !
+ BinArea = 0; // let's be carefull !
+ SelfArea = true;
}
/**
* \brief Canonical destructor.
*/
-gdcmBinEntry::~gdcmBinEntry()
+BinEntry::~BinEntry()
{
- if (VoidArea)
+ if (BinArea && SelfArea)
{
- free (VoidArea);
- VoidArea = 0; // let's be carefull !
+ delete[] BinArea;
+ BinArea = 0; // let's be carefull !
}
}
* \brief canonical Printer
*/
-void gdcmBinEntry::Print(std::ostream &os)
+void BinEntry::Print(std::ostream &os)
{
- gdcmDocEntry::Print(os);
+ os << "B ";
+ DocEntry::Print(os);
std::ostringstream s;
- void *voidArea = GetVoidArea();
- if (voidArea)
+ void* binArea = GetBinArea();
+ if (binArea)
{
//s << " [" << GDCM_BINLOADED
s << " [" << GetValue()
* @param fp already open file pointer
* @param filetype type of the file to be written
*/
-void gdcmBinEntry::Write(FILE *fp, FileType filetype)
+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
- fseek(fp,(size_t)lgr,SEEK_CUR);
+ fp->seekp(lgr, std::ios_base::cur);
}
}
//-----------------------------------------------------------------------------
/// \brief Sets the value (non string) of the current Dicom Header Entry
-void gdcmBinEntry::SetVoidArea(void* area)
+void BinEntry::SetBinArea( uint8_t* area, bool self )
{
- if (VoidArea)
- free(VoidArea);
- VoidArea = area;
+ if (BinArea && SelfArea)
+ delete[] BinArea;
+
+ BinArea = area;
+ SelfArea=self;
}
//-----------------------------------------------------------------------------
// Private
//-----------------------------------------------------------------------------
+} // end namespace gdcm