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/16 04:50:41 $
+ Version: $Revision: 1.53 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* \brief canonical Printer
*/
-void BinEntry::Print(std::ostream &os)
+void BinEntry::Print(std::ostream &os, std::string const & )
{
os << "B ";
DocEntry::Print(os);
// 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
{