X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=d17fe6ae255c23439f3c685368cec0c5fa0a39ae;hb=ba2ea83f67d798dfa2efae2fb21d3b5858c9c95c;hp=678f6fb1d004069922a0e1fa86c318e9ebdfb40d;hpb=018a3bbd1c375f4fdb1970cfc23f61b4fe04eb20;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 678f6fb1..d17fe6ae 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/02/02 17:20:34 $
-  Version:   $Revision: 1.62 $
+  Date:      $Date: 2005/02/10 14:23:18 $
+  Version:   $Revision: 1.68 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -48,7 +48,7 @@ BinEntry::BinEntry(DocEntry *e)
 {
    Copy(e);
 
-   BinArea = 0; // let's be carefull !
+   BinArea = 0;
    SelfArea = true;
 }
 
@@ -73,7 +73,6 @@ BinEntry::~BinEntry()
 */
 void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
 { 
-#define BUFFER_SIZE 4096
    DocEntry::WriteContent(fp, filetype);
    void* binArea = GetBinArea();
    int lgr = GetLength();
@@ -86,16 +85,17 @@ void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
    //   and we are working on Little Endian Processor
 
 #ifdef GDCM_WORDS_BIGENDIAN
+      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 *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;
@@ -103,7 +103,9 @@ void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
          {
             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;
@@ -112,7 +114,9 @@ void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
          {
             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 );
          }