* Activate Debug mode

[gdcm.git] / src / gdcmUtil.cxx

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 20861332ea2c55e15ba96f2edf33346da9bec1aa..8825cb97d9f3cab91337203be6c3e79d7eaa2d12 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/11 19:00:39 $
-  Version:   $Revision: 1.134 $
+  Date:      $Date: 2005/02/11 20:48:49 $
+  Version:   $Revision: 1.139 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -351,7 +351,7 @@ unsigned int Util::GetCurrentProcessID()
  */
 bool Util::IsCurrentProcessorBigEndian()
 {
-#ifdef GDCM_WORDS_BIGENDIAN
+#if defined(GDCM_WORDS_BIGENDIAN)
    return true;
 #else
    return false;
@@ -809,17 +809,6 @@ const std::string &Util::GetRootUID()
 }
 
 //-------------------------------------------------------------------------
-/**
- * \brief class for binary write
- * @param os ostream to write to
- * @param val val
- */ 
-template <class T>
-std::ostream &binary_write(std::ostream &os, const T &val)
-{
-   return os.write(reinterpret_cast<const char*>(&val), sizeof val);
-}
-
 /**
  * \brief binary_write binary_write
  * @param os ostream to write to 
@@ -827,7 +816,7 @@ std::ostream &binary_write(std::ostream &os, const T &val)
  */ 
 std::ostream &binary_write(std::ostream &os, const uint16_t &val)
 {
-#ifdef GDCM_WORDS_BIGENDIAN
+#if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)
    uint16_t swap;
    swap = ((( val << 8 ) & 0xff00 ) | (( val >> 8 ) & 0x00ff ) );
    return os.write(reinterpret_cast<const char*>(&swap), 2);
@@ -843,7 +832,7 @@ std::ostream &binary_write(std::ostream &os, const uint16_t &val)
  */ 
 std::ostream &binary_write(std::ostream &os, const uint32_t &val)
 {
-#ifdef GDCM_WORDS_BIGENDIAN
+#if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)
    uint32_t swap;
    swap = ( ((val<<24) & 0xff000000) | ((val<<8)  & 0x00ff0000) | 
             ((val>>8)  & 0x0000ff00) | ((val>>24) & 0x000000ff) );
@@ -894,23 +883,24 @@ std::ostream &binary_write(std::ostream &os, const uint16_t *val, size_t len)
 // This is tricky since we are writting two bytes buffer. Be carefull with little endian
 // vs big endian. Also this other trick is to allocate a small (efficient) buffer that store
 // intermidiate result before writting it.
-#ifdef GDCM_WORDS_BIGENDIAN
+#if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)
    const int BUFFER_SIZE = 4096;
    uint16_t *buffer = new uint16_t[BUFFER_SIZE/2];
+   uint16_t *binArea16 = (uint16_t*)val;
  
    // how many BUFFER_SIZE long pieces in binArea ?
-   int nbPieces = lgr/BUFFER_SIZE; //(16 bits = 2 Bytes)
-   int remainingSize = lgr%BUFFER_SIZE;
+   int nbPieces = len/BUFFER_SIZE; //(16 bits = 2 Bytes)
+   int remainingSize = len%BUFFER_SIZE;
 
    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 ) );
+         uint16_t val16 = binArea16[i];
+         buffer[i] = ((( val16 << 8 ) & 0xff00 ) | (( val16 >> 8 ) & 0x00ff ) );
       }
-      fp->write ( (char*)buffer, BUFFER_SIZE );
+      os.write ( (char*)buffer, BUFFER_SIZE );
       binArea16 += BUFFER_SIZE/2;
    }
    if ( remainingSize > 0)
@@ -918,12 +908,13 @@ std::ostream &binary_write(std::ostream &os, const uint16_t *val, size_t len)
       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 ) );
+         uint16_t val16 = binArea16[i];
+         buffer[i] = ((( val16 << 8 ) & 0xff00 ) | (( val16 >> 8 ) & 0x00ff ) );
       }
-      fp->write ( (char*)buffer, remainingSize );
+      os.write ( (char*)buffer, remainingSize );
    }
    delete[] buffer;
+   return os;
 #else
    return os.write(reinterpret_cast<const char*>(val), len);
 #endif