Program: gdcm
Module: $RCSfile: gdcmBinEntry.cxx,v $
Language: C++
- Date: $Date: 2004/09/15 03:50:48 $
- Version: $Revision: 1.27 $
+ Date: $Date: 2005/01/14 17:38:32 $
+ Version: $Revision: 1.51 $
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>
+#include <sstream>
+#include <iostream> // for std::ios_base, since <ios> does not exist on gcc/Solaris
+
+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 = 0;
+ 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();
+ Copy(e);
+/* Length = e->GetLength();
+ ReadLength = e->GetReadLength();
+ ImplicitVR = e->IsImplicitVR();
+ Offset = e->GetOffset();*/
+
//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)
-{
- gdcmDocEntry::Write(fp, filetype);
- void *voidArea = GetVoidArea();
+void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
+{
+#define BUFFER_SIZE 4096
+ DocEntry::WriteContent(fp, filetype);
+ void* binArea = GetBinArea();
int lgr = GetLength();
- if (voidArea)
+ if (binArea) // the binArea was *actually* loaded
{
- // there is a 'non string' LUT, overlay, etc
- fwrite ( voidArea,(size_t)lgr ,(size_t)1 ,fp); // Elem value
+
+ // 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
+
+#ifdef GDCM_WORDS_BIGENDIAN
+ // Be carefull with *any* 16 bits words 'binEntries !'
+ // if ( GetVR() == "OW") // to be used later
+
+ // TODO FIXME Right now, we only care of Pixels element
+
+ // 8 Bits Pixels *are* OB, 16 Bits Pixels *are* OW
+ // -value forced while Reading process-
+ if (GetGroup() == 0x7fe0 && GetVR() == "OW")
+ {
+ 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 ...
+ 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] = (binArea16[i] >> 8) | (binArea16[i] << 8);
+ }
+ fp->write ( (char*)currPosition, BUFFER_SIZE );
+ currPosition += BUFFER_SIZE/2;
+ }
+ int remainingSize = lgr%BUFFER_SIZE;
+ if ( remainingSize != 0)
+ {
+ fp->write ( (char*)currPosition, remainingSize );
+ }
+ delete[] buffer;
+ }
+ else
+ {
+ // For any other VR, BinEntry is re-written as-is
+ fp->write ( (char*)binArea, lgr );
+ }
+#else
+ fp->write ( (char*)binArea, lgr ); // Elem value
+#endif //GDCM_WORDS_BIGENDIAN
+
}
else
{
- // nothing was loaded, but we need to skip space on disc
- fseek(fp,(size_t)lgr,SEEK_CUR);
+ // nothing was loaded, but we need to skip space on disc
+ fp->seekp(lgr, std::ios::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
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff