Program: gdcm
Module: $RCSfile: gdcmUtil.cxx,v $
Language: C++
- Date: $Date: 2005/02/14 15:52:39 $
- Version: $Revision: 1.143 $
+ Date: $Date: 2005/06/08 12:24:53 $
+ Version: $Revision: 1.154 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <stdarg.h> //only included in implementation file
#include <stdio.h> //only included in implementation file
-#if defined(_MSC_VER) || defined(__MINGW32__)
- #include <winsock.h> // for gethostname and gethostbyname
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
+ #include <winsock.h> // for gethostname and gethostbyname and GetTickCount...
+#ifndef __BORLANDC__
#undef GetCurrentTime
+#endif
#else
-#ifndef __BORLANDC__
#include <unistd.h> // for gethostname
#include <netdb.h> // for gethostbyname
#endif
-#endif
// For GetMACAddress
#ifdef _WIN32
//-------------------------------------------------------------------------
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;
+std::string Util::GDCM_MAC_ADRESS = GetMACAddress();
//-------------------------------------------------------------------------
// Public
strftime (tmp, sizeof (tmp), "%Y%m%d%H%M%S", ptm);
// Add milliseconds
- std::string r = tmp;
- r += Format("%03ld", milliseconds);
+ // Don't use Util::Format to accelerate execution of code
+ char tmpAll[80];
+ sprintf(tmpAll,"%s%03ld",tmp,milliseconds);
- return r;
+ return tmpAll;
}
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()
* \brief Create a /DICOM/ string:
* It should a of even length (no odd length ever)
* It can contain as many (if you are reading this from your
- * editor the following character is is backslash followed by zero
+ * editor the following character is backslash followed by zero
* that needed to be escaped with an extra backslash for doxygen) \\0
* as you want.
* This function is similar to DicomString(const char*),
#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;
// 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;
// A root was specified use it to forge our new UID:
append += ".";
- append += Util::GetMACAddress();
+ //append += Util::GetMACAddress(); // to save CPU time
+ append += Util::GDCM_MAC_ADRESS;
append += ".";
append += Util::GetCurrentDateTime();
//Also add a mini random number just in case:
+ char tmp[10];
int r = (int) (100.0*rand()/RAND_MAX);
- append += Format("%02d", r);
+ // Don't use Util::Format to accelerate the execution
+ sprintf(tmp,"%02d", r);
+ append += tmp;
// If append is too long we need to rehash it
if( (prefix + append).size() > 64 )
// 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)
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 );
- binArea16 += BUFFER_SIZE/2;
+ 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
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff