X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=4c6426e71771f43471b343c582ccc7dc6e7e2efa;hb=6af27c03498c9f88539eba1a71e48ee1297e7b47;hp=f1e234a1ecb278b9251314f50ed7dd5ac8699efd;hpb=d4968107a4bf830f86bd8fc46f188230c9b35b90;p=gdcm.git diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx index f1e234a1..4c6426e7 100644 --- a/src/gdcmBinEntry.cxx +++ b/src/gdcmBinEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmBinEntry.cxx,v $ Language: C++ - Date: $Date: 2005/01/08 23:14:05 $ - Version: $Revision: 1.45 $ + 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 @@ -110,18 +110,67 @@ void BinEntry::Print(std::ostream &os) * @param filetype type of the file to be written */ void BinEntry::WriteContent(std::ofstream *fp, FileType filetype) -{ +{ +#define BUFFER_SIZE 4096 DocEntry::WriteContent(fp, filetype); void* binArea = GetBinArea(); int lgr = GetLength(); - if (binArea) + if (binArea) // the binArea was *actually* loaded { - // there is a 'non string' LUT, overlay, etc + + // 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> 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 + // nothing was loaded, but we need to skip space on disc fp->seekp(lgr, std::ios::cur); } }