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

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 1d6a7c56..6394cd42 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/14 17:40:04 $
-  Version:   $Revision: 1.52 $
+  Date:      $Date: 2005/02/05 04:28:38 $
+  Version:   $Revision: 1.67 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,6 +17,8 @@
 =========================================================================*/
 
 #include "gdcmBinEntry.h"
+#include "gdcmContentEntry.h"
+
 #include "gdcmDebug.h"
 
 #include <fstream>
@@ -25,14 +27,13 @@
 
 namespace gdcm 
 {
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
-
 /**
  * \brief   Constructor from a given BinEntry
  */
-BinEntry::BinEntry(DictEntry *e) : ValEntry(e)
+BinEntry::BinEntry(DictEntry *e) 
+         :ContentEntry(e)
 {
    BinArea = 0;
    SelfArea = true;
@@ -42,16 +43,10 @@ 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) 
+        : ContentEntry(e->GetDictEntry())
 {
    Copy(e);
-/*   Length     = e->GetLength();
-   ReadLength = e->GetReadLength();
-   ImplicitVR = e->IsImplicitVR();
-   Offset     = e->GetOffset();*/
-
-   //FIXME
-   //SQDepthLevel = e->GetDepthLevel();
 
    BinArea = 0; // let's be carefull !
    SelfArea = true;
@@ -69,49 +64,15 @@ BinEntry::~BinEntry()
    }
 }
 
-
 //-----------------------------------------------------------------------------
-// Print
-/*
- * \brief   canonical Printer
- */
- 
-void BinEntry::Print(std::ostream &os)
-{
-   os << "B ";
-   DocEntry::Print(os);
-   std::ostringstream s;
-   void* binArea = GetBinArea();
-   if (binArea)
-   {
-      //s << " [" << GDCM_BINLOADED 
-      s << " [" << GetValue()
-        << "; length = " << GetLength() << "]";
-   }
-   else
-   {
-      if ( GetLength() == 0 )
-      {
-         s << " []";
-      }
-      else 
-      {
-         //s << " [gdcm::Binary data NOT loaded]";
-         s << " [" <<GetValue() << "]";
-      }
-         
-   }
-   os << s.str();
-}
-
-/*
+// Public
+/**
  * \brief   canonical Writer
  * @param fp already open file pointer
- * @param filetype type of the file to be written
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
 */
 void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
 { 
-#define BUFFER_SIZE 4096
    DocEntry::WriteContent(fp, filetype);
    void* binArea = GetBinArea();
    int lgr = GetLength();
@@ -121,42 +82,45 @@ void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
    // 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
+   //   and we are working on Little Endian Processor
 
 #ifdef GDCM_WORDS_BIGENDIAN
-      // Be carefull with *any* 16 bits words 'binEntries !'
-      // if ( GetVR() == "OW") // to be used later
-
+      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 *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];
+         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;
          for (int j=0;j<nbPieces;j++)
          {
             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*)currPosition, BUFFER_SIZE );
-            currPosition += BUFFER_SIZE/2;
+            fp->write ( (char*)buffer, BUFFER_SIZE );
+            binArea16 += BUFFER_SIZE/2;
          }
-         int remainingSize = lgr%BUFFER_SIZE;
-         if ( remainingSize != 0)
+         if ( remainingSize > 0)
          {
-            fp->write ( (char*)currPosition, remainingSize );   
+            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; 
+         delete[] buffer;
       }
       else
       { 
@@ -174,11 +138,10 @@ void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
       fp->seekp(lgr, std::ios::cur);
    }
 }
-//-----------------------------------------------------------------------------
-// Public
-
 
-/// \brief Sets the value (non string) of the current Dicom Header Entry
+/**
+ * \brief Sets the value (non string) of the current Dicom Header Entry
+ */
 void BinEntry::SetBinArea( uint8_t *area, bool self )  
 { 
    if (BinArea && SelfArea)
@@ -194,5 +157,37 @@ void BinEntry::SetBinArea( uint8_t *area, bool self )
 //-----------------------------------------------------------------------------
 // Private
    
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief   Prints a BinEntry (Dicom entry)
+ * @param   os ostream we want to print in
+ * @param indent Indentation string to be prepended during printing
+ */
+void BinEntry::Print(std::ostream &os, std::string const & )
+{
+   os << "B ";
+   DocEntry::Print(os);
+   std::ostringstream s;
+   void* binArea = GetBinArea();
+   if (binArea)
+   {
+      s << " [" << GetValue()
+        << "; length = " << GetLength() << "]";
+   }
+   else
+   {
+      if ( GetLength() == 0 )
+      {
+         s << " []";
+      }
+      else 
+      {
+         s << " [" <<GetValue() << "]";
+      }         
+   }
+   os << s.str();
+}
+
 //-----------------------------------------------------------------------------
 } // end namespace gdcm