X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=e27e6982aeca670876a447f266fda95c11e6293d;hb=fa8fa610de8d935491343df2d8a543ff6fdb6e69;hp=6394cd427f4d6b5a094ccd277c12a6739a5a3257;hpb=d42dc0047e57b258bf1ac0f7b882e047e15efdf7;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 6394cd42..e27e6982 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/05 04:28:38 $
-  Version:   $Revision: 1.67 $
+  Date:      $Date: 2005/09/21 09:44:59 $
+  Version:   $Revision: 1.78 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,8 +18,7 @@
 
 #include "gdcmBinEntry.h"
 #include "gdcmContentEntry.h"
-
-#include "gdcmDebug.h"
+#include "gdcmUtil.h"
 
 #include <fstream>
 #include <sstream>
@@ -48,7 +47,7 @@ BinEntry::BinEntry(DocEntry *e)
 {
    Copy(e);
 
-   BinArea = 0; // let's be carefull !
+   BinArea = 0;
    SelfArea = true;
 }
 
@@ -74,61 +73,45 @@ BinEntry::~BinEntry()
 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
 
-#ifdef GDCM_WORDS_BIGENDIAN
-      const int BUFFER_SIZE = 4096;
-      // TODO FIXME Right now, we only care of Pixels element
+#if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)
+
+      /// \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-
       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 );
       }
 #else
-      fp->write ( (char*)binArea, lgr ); // Elem value
+      binary_write ( *fp, binArea8, lgr ); // Elem value
 #endif //GDCM_WORDS_BIGENDIAN
 
    }
@@ -172,8 +155,47 @@ void BinEntry::Print(std::ostream &os, std::string const & )
    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
    {