Program: gdcm
Module: $RCSfile: gdcmBinEntry.cxx,v $
Language: C++
- Date: $Date: 2005/02/02 10:02:16 $
- Version: $Revision: 1.61 $
+ Date: $Date: 2005/02/05 04:28:38 $
+ Version: $Revision: 1.67 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
{
-#define BUFFER_SIZE 4096
DocEntry::WriteContent(fp, filetype);
void* binArea = GetBinArea();
int lgr = GetLength();
// and we are working on Little Endian Processor
#ifdef GDCM_WORDS_BIGENDIAN
- // Be carefull with *any* 16 bits words 'binEntries !'
- // if ( GetVR() == "OW") // to be used later
-
+ const int BUFFER_SIZE = 4096;
// 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];
+ uint16_t *buffer = new uint16_t[BUFFER_SIZE/2];
// how many BUFFER_SIZE long pieces in binArea ?
- int nbPieces = lgr/BUFFER_SIZE/2; //(16 bits = 2 Bytes)
+ int nbPieces = lgr/BUFFER_SIZE; //(16 bits = 2 Bytes)
+ int remainingSize = lgr%BUFFER_SIZE;
+
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);
+ //buffer[i] = (binArea16[i] >> 8) | (binArea16[i] << 8);
+ uint16_t val = binArea16[i];
+ buffer[i] = ((( val << 8 ) & 0xff00 ) | (( val >> 8 ) & 0x00ff ) );
}
- fp->write ( (char*)currPosition, BUFFER_SIZE );
- currPosition += BUFFER_SIZE/2;
+ fp->write ( (char*)buffer, BUFFER_SIZE );
+ binArea16 += BUFFER_SIZE/2;
}
- int remainingSize = lgr%BUFFER_SIZE;
- if ( remainingSize != 0)
+ if ( remainingSize > 0)
{
- fp->write ( (char*)currPosition, remainingSize );
+ for (int i = 0; i < remainingSize/2; i++)
+ {
+ //buffer[i] = (binArea16[i] >> 8) | (binArea16[i] << 8);
+ uint16_t val = binArea16[i];
+ buffer[i] = ((( val << 8 ) & 0xff00 ) | (( val >> 8 ) & 0x00ff ) );
+ }
+ fp->write ( (char*)buffer, remainingSize );
}
- delete[] buffer;
+ delete[] buffer;
}
else
{