X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=4c6426e71771f43471b343c582ccc7dc6e7e2efa;hb=6af27c03498c9f88539eba1a71e48ee1297e7b47;hp=2b0bc0ef81ea11ff059df9114b94a6e4babe4eb7;hpb=bba6b52311989034cfaca84d1ab1e492d94c1873;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 2b0bc0ef..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: 2004/11/30 16:24:31 $
-  Version:   $Revision: 1.40 $
+  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
@@ -18,7 +18,9 @@
 
 #include "gdcmBinEntry.h"
 #include "gdcmDebug.h"
+
 #include <fstream>
+#include <sstream>
 #include <iostream> // for std::ios_base, since <ios> does not exist on gcc/Solaris
 
 namespace gdcm 
@@ -30,7 +32,7 @@ namespace gdcm
 /**
  * \brief   Constructor from a given BinEntry
  */
-BinEntry::BinEntry(DictEntry* e) : ValEntry(e)
+BinEntry::BinEntry(DictEntry *e) : ValEntry(e)
 {
    BinArea = 0;
    SelfArea = true;
@@ -40,13 +42,14 @@ BinEntry::BinEntry(DictEntry* e) : ValEntry(e)
  * \brief   Constructor from a given BinEntry
  * @param   e Pointer to existing Doc entry
  */
-BinEntry::BinEntry(DocEntry* e) : ValEntry(e->GetDictEntry())
+BinEntry::BinEntry(DocEntry *e) : ValEntry(e->GetDictEntry())
 {
-   UsableLength = e->GetLength();
-   ReadLength   = e->GetReadLength();
-   ImplicitVR   = e->IsImplicitVR();
-   Offset       = e->GetOffset();
-   PrintLevel   = e->GetPrintLevel();
+   Copy(e);
+/*   Length     = e->GetLength();
+   ReadLength = e->GetReadLength();
+   ImplicitVR = e->IsImplicitVR();
+   Offset     = e->GetOffset();*/
+
    //FIXME
    //SQDepthLevel = e->GetDepthLevel();
 
@@ -106,22 +109,69 @@ void BinEntry::Print(std::ostream &os)
  * @param fp already open file pointer
  * @param filetype type of the file to be written
 */
-void BinEntry::WriteContent(std::ofstream* fp, FileType filetype)
-{
+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<nbPieces;j++)
+         {
+            for (int i = 0; i < BUFFER_SIZE/2; i++)
+            {
+               buffer[i] =  (binArea16[i] >> 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
-      //assert( strlen((char*)binArea) == lgr );
+#endif //GDCM_WORDS_BIGENDIAN
 
    }
    else
    {
-    // nothing was loaded, but we need to skip space on disc
-      fp->seekp(lgr, std::ios_base::cur);
+      // nothing was loaded, but we need to skip space on disc
+      fp->seekp(lgr, std::ios::cur);
    }
 }
 //-----------------------------------------------------------------------------
@@ -129,7 +179,7 @@ void BinEntry::WriteContent(std::ofstream* fp, FileType filetype)
 
 
 /// \brief Sets the value (non string) of the current Dicom Header Entry
-void BinEntry::SetBinArea( uint8_t* area, bool self )  
+void BinEntry::SetBinArea( uint8_t *area, bool self )  
 { 
    if (BinArea && SelfArea)
       delete[] BinArea;