BUG: val/binArea16 mixup

[gdcm.git] / src / gdcmUtil.cxx

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index d51514cc332c2c742e8d6fda7df13571e68a6190..64562315c175020eda0d3480eed3b2d2407c1ade 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/05 01:37:09 $
-  Version:   $Revision: 1.132 $
+  Date:      $Date: 2005/02/11 19:09:30 $
+  Version:   $Revision: 1.136 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -437,7 +437,7 @@ bool Util::DicomStringEqual(const std::string &s1, const char *s2)
            OUT AsnObjectIdentifier * supportedView);
 #endif //_WIN32
 
-
+/// \brief gets current M.A.C adress (for internal use only)
 int GetMacAddrSys ( unsigned char *addr )
 {
 #ifdef _WIN32
@@ -450,8 +450,8 @@ int GetMacAddrSys ( unsigned char *addr )
 
    HANDLE PollForTrapEvent;
    AsnObjectIdentifier SupportedView;
-   UINT OID_ifEntryType[] = { 1, 3, 6, 1, 2, 1, 2, 2, 1, 3 };
-   UINT OID_ifEntryNum[] = { 1, 3, 6, 1, 2, 1, 2, 1 };
+   UINT OID_ifEntryType[]  = { 1, 3, 6, 1, 2, 1, 2, 2, 1, 3 };
+   UINT OID_ifEntryNum[]   = { 1, 3, 6, 1, 2, 1, 2, 1 };
    UINT OID_ipMACEntAddr[] = { 1, 3, 6, 1, 2, 1, 2, 2, 1, 6 };
    AsnObjectIdentifier MIB_ifMACEntAddr = {
        sizeof(OID_ipMACEntAddr) / sizeof(UINT), OID_ipMACEntAddr };
@@ -699,9 +699,9 @@ int GetMacAddrSys ( unsigned char *addr )
 }
 
 /**
- * Mini function to return the last digit from a number express in base 256
- * pre condition data contain an array of 6 unsigned char
- * post condition carry contain the last digit
+ * \brief Mini function to return the last digit from a number express in base 256
+ *        pre condition data contain an array of 6 unsigned char
+ *        post condition carry contain the last digit
  */
 inline int getlastdigit(unsigned char *data)
 {
@@ -810,7 +810,7 @@ const std::string &Util::GetRootUID()
 
 //-------------------------------------------------------------------------
 /**
- * \brief
+ * \brief class for binary write
  * @param os ostream to write to
  * @param val val
  */ 
@@ -873,6 +873,63 @@ std::ostream &binary_write(std::ostream &os, std::string const &val)
    return os.write(val.c_str(), val.size());
 }
 
+/**
+ * \brief  binary_write binary_write
+ * @param os ostream to write to
+ * @param val val
+ */ 
+std::ostream &binary_write(std::ostream &os, const uint8_t *val, size_t len)
+{
+   // We are writting sizeof(char) thus no need to swap bytes
+   return os.write(reinterpret_cast<const char*>(val), len);
+}
+
+/**
+ * \brief  binary_write binary_write
+ * @param os ostream to write to
+ * @param val val
+ */ 
+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
+   const int BUFFER_SIZE = 4096;
+   uint16_t *buffer = new uint16_t[BUFFER_SIZE/2];
+   uint16_t *binArea16 = val;
+ 
+   // how many BUFFER_SIZE long pieces in binArea ?
+   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 val16 = binArea16[i];
+         buffer[i] = ((( val16 << 8 ) & 0xff00 ) | (( val16 >> 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 val16 = binArea16[i];
+         buffer[i] = ((( val16 << 8 ) & 0xff00 ) | (( val16 >> 8 ) & 0x00ff ) );
+      }
+      fp->write ( (char*)buffer, remainingSize );
+   }
+   delete[] buffer;
+#else
+   return os.write(reinterpret_cast<const char*>(val), len);
+#endif
+}
+
 //-------------------------------------------------------------------------
 // Protected