Program: gdcm
Module: $RCSfile: gdcmBinEntry.cxx,v $
Language: C++
- Date: $Date: 2005/01/14 15:06:37 $
- Version: $Revision: 1.47 $
+ Date: $Date: 2005/01/30 17:30:57 $
+ Version: $Revision: 1.59 $
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 "gdcmContentEntry.h"
+
#include "gdcmDebug.h"
#include <fstream>
/**
* \brief Constructor from a given BinEntry
*/
-BinEntry::BinEntry(DictEntry *e) : ValEntry(e)
+BinEntry::BinEntry(DictEntry *e) : ContentEntry(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) : ContentEntry(e->GetDictEntry())
{
Copy(e);
-/* Length = e->GetLength();
- ReadLength = e->GetReadLength();
- ImplicitVR = e->IsImplicitVR();
- Offset = e->GetOffset();*/
-
- //FIXME
- //SQDepthLevel = e->GetDepthLevel();
BinArea = 0; // let's be carefull !
SelfArea = true;
}
}
-
//-----------------------------------------------------------------------------
// Print
-/*
- * \brief canonical Printer
+/**
+ * \brief Prints a BinEntry (Dicom entry)
+ * @param os ostream we want to print in
+ * @param indent Indentation string to be prepended during printing
*/
-
-void BinEntry::Print(std::ostream &os)
+void BinEntry::Print(std::ostream &os, std::string const & )
{
os << "B ";
DocEntry::Print(os);
{
//s << " [gdcm::Binary data NOT loaded]";
s << " [" <<GetValue() << "]";
- }
-
+ }
}
os << s.str();
}
-/*
+//-----------------------------------------------------------------------------
+// Public
+/**
* \brief canonical Writer
* @param fp already open file pointer
- * @param filetype type of the file to be written
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
*/
void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
{
// TODO FIME
// Probabely, the same operation will have to be done when we want
// to write image with Big Endian Transfert Syntax,
- // and we are working onj Little Endian Processor
+ // and we are working on Little Endian Processor
#ifdef GDCM_WORDS_BIGENDIAN
// Be carefull with *any* 16 bits words 'binEntries !'
// 8 Bits Pixels *are* OB, 16 Bits Pixels *are* OW
// -value forced while Reading process-
- if (GetGroup == 0x7fe0 && GetVR() == "OW")
+ if (GetGroup() == 0x7fe0 && GetVR() == "OW")
{
- unit16_t *currPosition = (uint16_t *)binArea;
+ uint16_t *currPosition = (uint16_t *)binArea;
// TODO FIXME : Maybe we should allocate somewhere a static buffer,
// in order not to have to alloc/delete for almost every BinEntry ...
- unit16_t *buffer = new uint16[BUFFER_SIZE];
+ uint16_t *buffer = new uint16_t[BUFFER_SIZE];
// how many BUFFER_SIZE long pieces in binArea ?
int nbPieces = lgr/BUFFER_SIZE/2; //(16 bits = 2 Bytes)
+ uint16_t *binArea16 = (uint16_t*)binArea;
for (int j=0;j<nbPieces;j++)
{
for (int i = 0; i < BUFFER_SIZE/2; i++)
{
- buffer[i] = (uint16_t *)binArea[i] >> 8
- | (uint16_t *)binArea[i] << 8;
+ buffer[i] = (binArea16[i] >> 8) | (binArea16[i] << 8);
}
fp->write ( (char*)currPosition, BUFFER_SIZE );
currPosition += BUFFER_SIZE/2;
{
fp->write ( (char*)currPosition, remainingSize );
}
- delete buffer;
+ delete[] buffer;
}
else
{
fp->seekp(lgr, std::ios::cur);
}
}
-//-----------------------------------------------------------------------------
-// Public
-
-/// \brief Sets the value (non string) of the current Dicom Header Entry
+/**
+ * \brief Sets the value (non string) of the current Dicom Header Entry
+ */
void BinEntry::SetBinArea( uint8_t *area, bool self )
{
if (BinArea && SelfArea)