Program: gdcm
Module: $RCSfile: gdcmBinEntry.cxx,v $
Language: C++
- Date: $Date: 2005/02/02 17:47:56 $
- Version: $Revision: 1.63 $
+ Date: $Date: 2005/02/11 16:36:52 $
+ Version: $Revision: 1.69 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
{
Copy(e);
- BinArea = 0; // let's be carefull !
+ BinArea = 0;
SelfArea = true;
}
*/
void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
{
-#define BUFFER_SIZE 4096
DocEntry::WriteContent(fp, filetype);
void* binArea = GetBinArea();
int lgr = GetLength();
if (binArea) // the binArea was *actually* loaded
{
- // 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 on Little Endian Processor
+ /// \todo Probabely, the same operation will have to be done when we want
+ /// to write image with Big Endian Transfert Syntax,
+ /// and we are working on Little Endian Processor
-/*#ifdef GDCM_WORDS_BIGENDIAN
- // TODO FIXME Right now, we only care of Pixels element
+#ifdef GDCM_WORDS_BIGENDIAN
+ const int BUFFER_SIZE = 4096;
+ /// \todo FIXME Right now, we only care of Pixels element
+ /// we should deal with *all* the BinEntries
// 8 Bits Pixels *are* OB, 16 Bits Pixels *are* OW
// -value forced while Reading process-
if (GetGroup() == 0x7fe0 && GetVR() == "OW")
{
- 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 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*)buffer, BUFFER_SIZE );
binArea16 += BUFFER_SIZE/2;
{
for (int i = 0; i < remainingSize/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*)buffer, remainingSize );
}
// For any other VR, BinEntry is re-written as-is
fp->write ( (char*)binArea, lgr );
}
-#else*/
+#else
fp->write ( (char*)binArea, lgr ); // Elem value
-//#endif //GDCM_WORDS_BIGENDIAN
+#endif //GDCM_WORDS_BIGENDIAN
}
else