Program: gdcm
Module: $RCSfile: gdcmBinEntry.cxx,v $
Language: C++
- Date: $Date: 2005/02/10 14:23:18 $
- Version: $Revision: 1.68 $
+ Date: $Date: 2005/10/11 14:48:19 $
+ Version: $Revision: 1.80 $
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 "gdcmUtil.h"
#include <fstream>
#include <sstream>
void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
{
DocEntry::WriteContent(fp, filetype);
- void* binArea = GetBinArea();
- int lgr = GetLength();
- if (binArea) // the binArea was *actually* loaded
+ uint8_t *binArea8 = BinArea; //safe notation
+ size_t 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
+ // The same operation should be done if we wanted
+ // to write image with Big Endian Transfer Syntax,
+ // while working on Little Endian Processor
+ // --> forget Big Endian Transfer Syntax writting!
+ // Next DICOM version will give it up ...
+
+ // -->
+ // --> FIXME
+ // -->
+ // The stuff looks nice, but it's probably bugged,
+ // since troubles occur on big endian processors (SunSparc, Motorola)
+ // while reading the pixels of a
+ // gdcm-written Little-Endian 16 bits per pixel image
+
+#if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)
-#ifdef GDCM_WORDS_BIGENDIAN
- const int BUFFER_SIZE = 4096;
- // TODO FIXME Right now, we only care of Pixels element
+ /// \todo FIXME : Right now, we only care of Pixels element
+ /// we should deal with *all* the BinEntries
+ /// Well, not really since we are not interpreting values read...
// 8 Bits Pixels *are* OB, 16 Bits Pixels *are* OW
// -value forced while Reading process-
+
+ //-->
+ // -->
+ // --> WARNING
+ // --> the following lines *looked* very clever,
+ // --> but they don't work on big endian processors.
+ // --> since I've no access for the moment to a big endian proc :-(
+ // --> I comment them out, to see the result on the dash board
+ // -->
+
+ // --> Revert to initial code : TestWriteSimple hangs on Darwin :-(
if (GetGroup() == 0x7fe0 && GetVR() == "OW")
- {
- uint16_t *buffer = new uint16_t[BUFFER_SIZE/2];
-
- // how many BUFFER_SIZE long pieces in binArea ?
- 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);
- uint16_t val = binArea16[i];
- buffer[i] = ((( val << 8 ) & 0xff00 ) | (( val >> 8 ) & 0x00ff ) );
- }
- fp->write ( (char*)buffer, BUFFER_SIZE );
- binArea16 += BUFFER_SIZE/2;
- }
- if ( remainingSize > 0)
- {
- 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;
+ {
+ uint16_t *binArea16 = (uint16_t*)binArea8;
+ binary_write (*fp, binArea16, lgr );
}
else
{
// For any other VR, BinEntry is re-written as-is
- fp->write ( (char*)binArea, lgr );
+ binary_write (*fp, binArea8, lgr );
}
+
+ //-->
+ // -->
+ // --> WARNING
+ // --> remove the following line, an uncomment the previous ones,
+ // --> if it doesn't work better
+ // -->
+ /*binary_write ( *fp, binArea8, lgr ); // Elem value*/
+
#else
- fp->write ( (char*)binArea, lgr ); // Elem value
+ binary_write ( *fp, binArea8, lgr ); // Elem value
#endif //GDCM_WORDS_BIGENDIAN
}
else
{
// nothing was loaded, but we need to skip space on disc
+
+ // --> WARNING : nothing is written;
+ // --> the initial data (on the the source image) is lost
+ // --> user is *not* informed !
+
fp->seekp(lgr, std::ios::cur);
}
}
void* binArea = GetBinArea();
if (binArea)
{
- s << " [" << GetValue()
- << "; length = " << GetLength() << "]";
+ if ( GetVR() == "FL" )
+ {
+ int l = GetReadLength()/4 - 1;
+ float *beg = (float *)GetBinArea();
+ s << " [" << *beg;
+ if ( l!= 0)
+ for (int i=0;i<l;i++)
+ {
+ beg++;
+ s << "\\" << *beg;
+ }
+ s << "]";
+ }
+ else if ( GetVR() == "FD" )
+ {
+ int l = GetReadLength()/8 - 1;
+ double *beg = (double *)GetBinArea();
+ s << " [" << *beg;
+ if ( l!= 0)
+ for (int i=0;i<l;i++)
+ {
+ beg++;
+ s << "\\" << *beg;
+ }
+ s << "]";
+ }
+ else
+ {
+ if ( Util::IsCleanArea( GetBinArea(),GetLength() ) )
+ {
+ std::string cleanString =
+ Util::CreateCleanString( GetBinArea(),GetLength() );
+ s << " [" << cleanString << "]";
+ }
+ else
+ {
+ //s << " [" << GetValue()
+ s << " [" << GDCM_BINLOADED << ";"
+ << "length = " << GetLength() << "]";
+ }
+ }
}
else
{