ENH: Some minor enhance:

[gdcm.git] / src / gdcmUtil.cxx

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index cbf2f190a100db5933ce649918d53c125d397fc7..6ddba792fd5bcda525715a689687fa3d3d9bb7ff 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/14 16:04:02 $
-  Version:   $Revision: 1.144 $
+  Date:      $Date: 2005/05/11 14:40:57 $
+  Version:   $Revision: 1.149 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -92,6 +92,8 @@ namespace gdcm
 //-------------------------------------------------------------------------
 const std::string Util::GDCM_UID = "1.2.826.0.1.3680043.2.1143";
 std::string Util::RootUID        = GDCM_UID;
+const uint16_t Util::FMIV = 0x0001;
+uint8_t *Util::FileMetaInformationVersion = (uint8_t *)&FMIV;
 
 //-------------------------------------------------------------------------
 // Public
@@ -329,18 +331,20 @@ unsigned int Util::GetCurrentThreadID()
 // FIXME the implementation is far from complete
 #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
   return (unsigned int)GetCurrentThreadId();
-#endif
+#else
 #ifdef __linux__
    return 0;
    // Doesn't work on fedora, but is in the man page...
    //return (unsigned int)gettid();
-#endif
+#else
 #ifdef __sun
    return (unsigned int)thr_self();
 #else
    //default implementation
    return 0;
-#endif
+#endif // __sun
+#endif // __linux__
+#endif // Win32
 }
 
 unsigned int Util::GetCurrentProcessID()
@@ -446,11 +450,12 @@ bool Util::DicomStringEqual(const std::string &s1, const char *s2)
 #endif //_WIN32
 
 /// \brief gets current M.A.C adress (for internal use only)
+int GetMacAddrSys ( unsigned char *addr );
 int GetMacAddrSys ( unsigned char *addr )
 {
 #ifdef _WIN32
    WSADATA WinsockData;
-   if (WSAStartup(MAKEWORD(2, 0), &WinsockData) != 0) 
+   if ( (WSAStartup(MAKEWORD(2, 0), &WinsockData)) != 0) 
    {
       std::cerr << "This program requires Winsock 2.x!" << std::endl;
       return -1;
@@ -575,7 +580,7 @@ int GetMacAddrSys ( unsigned char *addr )
 
 
 // implementation for POSIX system
-#ifdef __sun
+#if defined(CMAKE_HAVE_NET_IF_ARP_H) && defined(__sun)
    //The POSIX version is broken anyway on Solaris, plus would require full
    //root power
    struct  arpreq          parpreq;
@@ -903,9 +908,8 @@ std::ostream &binary_write(std::ostream &os, const uint16_t *val, size_t len)
 // intermediate result before writting it.
 #if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)
    const int BUFFER_SIZE = 4096;
-   uint16_t *binArea16 = (uint16_t*)val;
-   static uint16_t buffer[BUFFER_SIZE/2];
-   uint16_t *pbuffer   = buffer;
+   static char buffer[BUFFER_SIZE];
+   uint16_t *binArea16 = (uint16_t*)val; //for the const
  
    // how many BUFFER_SIZE long pieces in binArea ?
    int nbPieces = len/BUFFER_SIZE; //(16 bits = 2 Bytes)
@@ -913,32 +917,25 @@ std::ostream &binary_write(std::ostream &os, const uint16_t *val, size_t len)
 
    for (int j=0;j<nbPieces;j++)
    {
-
+      uint16_t *pbuffer  = (uint16_t*)buffer; //reinitialize pbuffer
       for (int i = 0; i < BUFFER_SIZE/2; i++)
       {
-        //uint16_t val16 = binArea16[i];
-        //buffer[i] = ((( val16 << 8 ) & 0xff00 ) | (( val16 >> 8 ) & 0x00ff ) );
-        // save CPU time :
-        //   1) Save 1 affectation and 2 AND operations
-        //       buffer[i] =  (binArea16[i] >> 8) | (binArea16[i] << 8);
-        //   2) Replace * operations by + operations using pointers
          *pbuffer = *binArea16 >> 8 | *binArea16 << 8;
          pbuffer++;
          binArea16++;
       }
-      os.write ( (char*)buffer, BUFFER_SIZE );
+      os.write ( buffer, BUFFER_SIZE );
    }
    if ( remainingSize > 0)
    {
+      uint16_t *pbuffer  = (uint16_t*)buffer; //reinitialize pbuffer
       for (int i = 0; i < remainingSize/2; i++)
       {
-         //uint16_t val16 = binArea16[i];
-         //buffer[i] = ((( val16 << 8 ) & 0xff00 ) | (( val16 >> 8 ) & 0x00ff) );
-         *pbuffer = *binArea16 >> 8 | *binArea16 >> 8;
+         *pbuffer = *binArea16 >> 8 | *binArea16 << 8;
          pbuffer++;
          binArea16++;
       }
-      os.write ( (char*)buffer, remainingSize );
+      os.write ( buffer, remainingSize );
    }
    return os;
 #else