X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=64562315c175020eda0d3480eed3b2d2407c1ade;hb=40f0708d21ca92b35385f00e44f671eb7bef37d0;hp=dee613e57bf53ca2684c370ace1c49586e2944f7;hpb=7f798bb2e7e985e1630e4b859154a92eae0d2ee0;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index dee613e5..64562315 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmUtil.cxx,v $ Language: C++ - Date: $Date: 2005/01/17 13:55:26 $ - Version: $Revision: 1.100 $ + 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 @@ -25,11 +25,17 @@ #include #include +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) +#include +#else +#include +#endif + #include //only included in implementation file #include //only included in implementation file -#if defined(_MSC_VER) - #include // for gethostname & gethostbyname +#if defined(_MSC_VER) || defined(__MINGW32__) + #include // for gethostname and gethostbyname #undef GetCurrentTime #else #ifndef __BORLANDC__ @@ -40,51 +46,56 @@ // For GetMACAddress #ifdef _WIN32 -#include -#include + #include + #include #else -#include -#include -#include -#include + #include + #include + #include + #include #endif -// How do I do that in CMake ? -#ifdef __APPLE__ -#define HAVE_SA_LEN -#define CMAKE_HAVE_NET_IF_DL_H -#define CMAKE_HAVE_NETINET_IN_H -#define CMAKE_HAVE_NET_IF_H -#endif //APPLE - #ifdef CMAKE_HAVE_SYS_IOCTL_H -#include // For SIOCGIFCONF on Linux + #include // For SIOCGIFCONF on Linux #endif #ifdef CMAKE_HAVE_SYS_SOCKET_H -#include + #include #endif #ifdef CMAKE_HAVE_SYS_SOCKIO_H -#include // For SIOCGIFCONF on SunOS + #include // For SIOCGIFCONF on SunOS #endif #ifdef CMAKE_HAVE_NET_IF_H -#include + #include #endif #ifdef CMAKE_HAVE_NETINET_IN_H -#include //For IPPROTO_IP + #include //For IPPROTO_IP #endif #ifdef CMAKE_HAVE_NET_IF_DL_H -#include + #include +#endif +#if defined(CMAKE_HAVE_NET_IF_ARP_H) && defined(__sun) + // This is absolutely necessary on SunOS + #include +#endif + +// For GetCurrentThreadID() +#ifdef __linux__ + #include + #include #endif #ifdef __sun -//#if defined(CMAKE_HAVE_NET_IF_ARP_H) && defined(__sun) -// This is absolutely necesseray on SunOS -#include + #include #endif namespace gdcm { +//------------------------------------------------------------------------- +const std::string Util::GDCM_UID = "1.2.826.0.1.3680043.2.1143"; +std::string Util::RootUID = GDCM_UID; + +//------------------------------------------------------------------------- +// Public /** - * \ingroup Globals * \brief Provide a better 'c++' approach for sprintf * For example c code is: * sprintf(trash, "%04x|%04x", group , elem); @@ -99,7 +110,6 @@ namespace gdcm * gdcm style code is * Format("%04x|%04x", group , elem); */ - std::string Util::Format(const char *format, ...) { char buffer[2048]; @@ -114,12 +124,11 @@ std::string Util::Format(const char *format, ...) /** - * \ingroup Globals * \brief Because not available in C++ (?) */ void Util::Tokenize (const std::string &str, std::vector &tokens, - const std::string& delimiters) + const std::string &delimiters) { std::string::size_type lastPos = str.find_first_not_of(delimiters,0); std::string::size_type pos = str.find_first_of (delimiters,lastPos); @@ -132,7 +141,6 @@ void Util::Tokenize (const std::string &str, } /** - * \ingroup Globals * \brief Because not available in C++ (?) * Counts the number of occurences of a substring within a string */ @@ -158,7 +166,6 @@ int Util::CountSubstring (const std::string &str, } /** - * \ingroup Globals * \brief Weed out a string from the non-printable characters (in order * to avoid corrupting the terminal of invocation when printing) * @param s string to remove non printable characters from @@ -190,7 +197,6 @@ std::string Util::CreateCleanString(std::string const &s) } /** - * \ingroup Globals * \brief Add a SEPARATOR to the end of the name is necessary * @param pathname file/directory name to normalize */ @@ -210,7 +216,6 @@ std::string Util::NormalizePath(std::string const &pathname) } /** - * \ingroup Globals * \brief Get the (directory) path from a full path file name * @param fullName file/directory name to extract Path from */ @@ -232,7 +237,6 @@ std::string Util::GetPath(std::string const &fullName) } /** - * \ingroup Util * \brief Get the (last) name of a full path file name * @param fullName file/directory name to extract end name from */ @@ -254,7 +258,6 @@ std::string Util::GetName(std::string const &fullName) } /** - * \ingroup Util * \brief Get the current date of the system in a dicom string */ std::string Util::GetCurrentDate() @@ -267,7 +270,6 @@ std::string Util::GetCurrentDate() } /** - * \ingroup Util * \brief Get the current time of the system in a dicom string */ std::string Util::GetCurrentTime() @@ -279,6 +281,83 @@ std::string Util::GetCurrentTime() return tmp; } +/** + * \brief Get both the date and time at the same time to avoid problem + * around midnight where two call could be before and after midnight + */ +std::string Util::GetCurrentDateTime() +{ + char tmp[40]; + long milliseconds; + time_t timep; + + // We need implementation specific functions to obtain millisecond precision +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + struct timeb tb; + ::ftime(&tb); + timep = tb.time; + milliseconds = tb.millitm; +#else + struct timeval tv; + gettimeofday (&tv, NULL); + timep = tv.tv_sec; + // Compute milliseconds from microseconds. + milliseconds = tv.tv_usec / 1000; +#endif + // Obtain the time of day, and convert it to a tm struct. + struct tm *ptm = localtime (&timep); + // Format the date and time, down to a single second. + strftime (tmp, sizeof (tmp), "%Y%m%d%H%M%S", ptm); + + // Add milliseconds + std::string r = tmp; + r += Format("%03ld", milliseconds); + + return r; +} + +unsigned int Util::GetCurrentThreadID() +{ +// FIXME the implementation is far from complete +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + return (unsigned int)GetCurrentThreadId(); +#endif +#ifdef __linux__ + return 0; + // Doesn't work on fedora, but is in the man page... + //return (unsigned int)gettid(); +#endif +#ifdef __sun + return (unsigned int)thr_self(); +#else + //default implementation + return 0; +#endif +} + +unsigned int Util::GetCurrentProcessID() +{ +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + // NOTE: There is also a _getpid()... + return (unsigned int)GetCurrentProcessId(); +#else + // get process identification, POSIX + return (unsigned int)getpid(); +#endif +} + +/** + * \brief tells us if the processor we are working with is BigEndian or not + */ +bool Util::IsCurrentProcessorBigEndian() +{ +#ifdef GDCM_WORDS_BIGENDIAN + return true; +#else + return false; +#endif +} + /** * \brief Create a /DICOM/ string: * It should a of even length (no odd length ever) @@ -295,15 +374,14 @@ std::string Util::DicomString(const char *s, size_t l) } /** - * \ingroup Util * \brief Create a /DICOM/ string: - * It should a of even lenght (no odd length ever) + * 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 * that needed to be escaped with an extra backslash for doxygen) \\0 * as you want. * This function is similar to DicomString(const char*), - * except it doesn't take a lenght. + * except it doesn't take a length. * It only pad with a null character if length is odd */ std::string Util::DicomString(const char *s) @@ -319,10 +397,9 @@ std::string Util::DicomString(const char *s) } /** - * \ingroup Util * \brief Safely compare two Dicom String: - * - Both string should be of even lenght - * - We allow padding of even lenght string by either a null + * - Both string should be of even length + * - We allow padding of even length string by either a null * character of a space */ bool Util::DicomStringEqual(const std::string &s1, const char *s2) @@ -337,47 +414,30 @@ bool Util::DicomStringEqual(const std::string &s1, const char *s2) return s1_even == s2_even; } - - -/** - * \ingroup Util - * \brief tells us if the processor we are working with is BigEndian or not - */ -bool Util::IsCurrentProcessorBigEndian() -{ -#ifdef GDCM_WORDS_BIGENDIAN - return true; -#else - return false; -#endif -} - - - #ifdef _WIN32 -typedef BOOL(WINAPI * pSnmpExtensionInit) ( - IN DWORD dwTimeZeroReference, - OUT HANDLE * hPollForTrapEvent, - OUT AsnObjectIdentifier * supportedView); - -typedef BOOL(WINAPI * pSnmpExtensionTrap) ( - OUT AsnObjectIdentifier * enterprise, - OUT AsnInteger * genericTrap, - OUT AsnInteger * specificTrap, - OUT AsnTimeticks * timeStamp, - OUT RFC1157VarBindList * variableBindings); - -typedef BOOL(WINAPI * pSnmpExtensionQuery) ( - IN BYTE requestType, - IN OUT RFC1157VarBindList * variableBindings, - OUT AsnInteger * errorStatus, - OUT AsnInteger * errorIndex); - -typedef BOOL(WINAPI * pSnmpExtensionInitEx) ( - OUT AsnObjectIdentifier * supportedView); + typedef BOOL(WINAPI * pSnmpExtensionInit) ( + IN DWORD dwTimeZeroReference, + OUT HANDLE * hPollForTrapEvent, + OUT AsnObjectIdentifier * supportedView); + + typedef BOOL(WINAPI * pSnmpExtensionTrap) ( + OUT AsnObjectIdentifier * enterprise, + OUT AsnInteger * genericTrap, + OUT AsnInteger * specificTrap, + OUT AsnTimeticks * timeStamp, + OUT RFC1157VarBindList * variableBindings); + + typedef BOOL(WINAPI * pSnmpExtensionQuery) ( + IN BYTE requestType, + IN OUT RFC1157VarBindList * variableBindings, + OUT AsnInteger * errorStatus, + OUT AsnInteger * errorIndex); + + typedef BOOL(WINAPI * pSnmpExtensionInitEx) ( + OUT AsnObjectIdentifier * supportedView); #endif //_WIN32 - +/// \brief gets current M.A.C adress (for internal use only) int GetMacAddrSys ( unsigned char *addr ) { #ifdef _WIN32 @@ -390,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 }; @@ -406,24 +466,18 @@ int GetMacAddrSys ( unsigned char *addr ) AsnObjectIdentifier MIB_NULL = { 0, 0 }; int ret; int dtmp; - int i = 0, j = 0; - BOOL found = FALSE; + int j = 0; // Load the SNMP dll and get the addresses of the functions necessary HINSTANCE m_hInst = LoadLibrary("inetmib1.dll"); if (m_hInst < (HINSTANCE) HINSTANCE_ERROR) { - m_hInst = NULL; return -1; } pSnmpExtensionInit m_Init = (pSnmpExtensionInit) GetProcAddress(m_hInst, "SnmpExtensionInit"); - pSnmpExtensionInitEx m_InitEx = - (pSnmpExtensionInitEx) GetProcAddress(m_hInst, "SnmpExtensionInitEx"); pSnmpExtensionQuery m_Query = (pSnmpExtensionQuery) GetProcAddress(m_hInst, "SnmpExtensionQuery"); - pSnmpExtensionTrap m_Trap = - (pSnmpExtensionTrap) GetProcAddress(m_hInst, "SnmpExtensionTrap"); m_Init(GetTickCount(), &PollForTrapEvent, &SupportedView); /* Initialize the variable list to be retrieved by m_Query */ @@ -435,10 +489,11 @@ int GetMacAddrSys ( unsigned char *addr ) // Inteface table varBindList.len = 1; // Only retrieving one item SNMP_oidcpy(&varBind[0].name, &MIB_ifEntryNum); - ret = m_Query(ASN_RFC1157_GETNEXTREQUEST, &varBindList, &errorStatus, + m_Query(ASN_RFC1157_GETNEXTREQUEST, &varBindList, &errorStatus, &errorIndex); // printf("# of adapters in this system : %i\n", -// varBind[0].value.asnValue.number); varBindList.len = 2; +// varBind[0].value.asnValue.number); + varBindList.len = 2; // Copy in the OID of ifType, the type of interface SNMP_oidcpy(&varBind[0].name, &MIB_ifEntryType); @@ -467,7 +522,6 @@ int GetMacAddrSys ( unsigned char *addr ) { j++; dtmp = varBind[0].value.asnValue.number; - std::cerr << "Interface #" << j << " type : " << dtmp << std::endl; // Type 6 describes ethernet interfaces if (dtmp == 6) @@ -477,13 +531,6 @@ int GetMacAddrSys ( unsigned char *addr ) MIB_ifMACEntAddr.idLength); if ( !ret && varBind[1].value.asnValue.address.stream != NULL ) { - if ( varBind[1].value.asnType != ASN_RFC1155_IPADDRESS ) - { - // Ignore all dial-up networking adapters - std::cerr << "Interface #" << j << " is not an IP adress\n"; - continue; - } - if ( (varBind[1].value.asnValue.address.stream[0] == 0x44) && (varBind[1].value.asnValue.address.stream[1] == 0x45) && (varBind[1].value.asnValue.address.stream[2] == 0x53) @@ -506,7 +553,6 @@ int GetMacAddrSys ( unsigned char *addr ) std::cerr << "Interface #" << j << " is a NULL address\n"; continue; } - memcpy( addr, varBind[1].value.asnValue.address.stream, 6); } } @@ -524,13 +570,10 @@ int GetMacAddrSys ( unsigned char *addr ) #ifdef __sun //The POSIX version is broken anyway on Solaris, plus would require full //root power - int i; struct arpreq parpreq; - struct sockaddr_in sa, *psa; - struct in_addr inaddr; + struct sockaddr_in *psa; struct hostent *phost; char hostname[MAXHOSTNAMELEN]; - unsigned char *ptr; char **paddrs; int sock, status=0; @@ -572,7 +615,7 @@ int GetMacAddrSys ( unsigned char *addr ) char buf[1024]; int n, i; unsigned char *a; -#ifdef AF_LINK +#if defined(AF_LINK) && (!defined(SIOCGIFHWADDR) && !defined(SIOCGENADDR)) struct sockaddr_dl *sdlp; #endif @@ -584,13 +627,13 @@ int GetMacAddrSys ( unsigned char *addr ) // We should investiage the use of SIZEOF_ADDR_IFREQ // #ifdef HAVE_SA_LEN -#ifndef max -#define max(a,b) ((a) > (b) ? (a) : (b)) -#endif -#define ifreq_size(i) max(sizeof(struct ifreq),\ - sizeof((i).ifr_name)+(i).ifr_addr.sa_len) + #ifndef max + #define max(a,b) ((a) > (b) ? (a) : (b)) + #endif + #define ifreq_size(i) max(sizeof(struct ifreq),\ + sizeof((i).ifr_name)+(i).ifr_addr.sa_len) #else -#define ifreq_size(i) sizeof(struct ifreq) + #define ifreq_size(i) sizeof(struct ifreq) #endif // HAVE_SA_LEN if( (sd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0 ) @@ -648,10 +691,34 @@ int GetMacAddrSys ( unsigned char *addr ) } close(sd); #endif + // Not implemented platforms + perror("There was a configuration problem on your plateform"); + memset(addr,0,6); return -1; #endif //__sun } +/** + * \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) +{ + int extended, carry = 0; + for(int i=0;i<6;i++) + { + extended = (carry << 8) + data[i]; + data[i] = extended / 10; + carry = extended % 10; + } + return carry; +} + +/** + * \brief Encode the mac address on a fixed lenght string of 15 characters. + * we save space this way. + */ std::string Util::GetMACAddress() { // This code is the result of a long internet search to find something @@ -660,29 +727,215 @@ std::string Util::GetMACAddress() // http://groups-beta.google.com/group/comp.unix.solaris/msg/ad36929d783d63be // http://bdn.borland.com/article/0,1410,26040,00.html unsigned char addr[6]; - int stat = GetMacAddrSys(addr); - if (0 == stat) + int stat = GetMacAddrSys(addr); + if (stat == 0) { - std::string macaddr = ""; - for (int i=0; i<6; ++i) + // We need to convert a 6 digit number from base 256 to base 10, using integer + // would requires a 48bits one. To avoid this we have to reimplement the div + modulo + // with string only + bool zero = false; + int res; + std::string sres; + while(!zero) { - //macaddr += Format("%2.2x", addr[i]); - if(i) - macaddr += "."; - macaddr += Format("%i", (int)addr[i]); + res = getlastdigit(addr); + sres.insert(sres.begin(), '0' + res); + zero = (addr[0] == 0) && (addr[1] == 0) && (addr[2] == 0) && (addr[3] == 0) && (addr[4] == 0) && (addr[5] == 0); } - return macaddr; + + return sres; } else { - gdcmVerboseMacro("Problem in finding the MAC Address"); + gdcmWarningMacro("Problem in finding the MAC Address"); return ""; } } /** - * \ingroup Util + * \brief Creates a new UID. As stipulate in the DICOM ref + * each time a DICOM image is create it should have + * a unique identifier (URI) + * @param root is the DICOM prefix assigned by IOS group + */ +std::string Util::CreateUniqueUID(const std::string &root) +{ + std::string prefix; + std::string append; + if( root.empty() ) + { + // gdcm UID prefix, as supplied by http://www.medicalconnections.co.uk + prefix = RootUID; + } + else + { + prefix = root; + } + + // A root was specified use it to forge our new UID: + append += "."; + append += Util::GetMACAddress(); + append += "."; + append += Util::GetCurrentDateTime(); + + //Also add a mini random number just in case: + int r = (int) (100.0*rand()/RAND_MAX); + append += Format("%02d", r); + + // If append is too long we need to rehash it + if( (prefix + append).size() > 64 ) + { + gdcmErrorMacro( "Size of UID is too long." ); + // we need a hash function to truncate this number + // if only md5 was cross plateform + // MD5(append); + } + + return prefix + append; +} + +void Util::SetRootUID(const std::string &root) +{ + if( root.empty() ) + RootUID = GDCM_UID; + else + RootUID = root; +} + +const std::string &Util::GetRootUID() +{ + return RootUID; +} + +//------------------------------------------------------------------------- +/** + * \brief class for binary write + * @param os ostream to write to + * @param val val + */ +template +std::ostream &binary_write(std::ostream &os, const T &val) +{ + return os.write(reinterpret_cast(&val), sizeof val); +} + +/** + * \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) +{ +#ifdef GDCM_WORDS_BIGENDIAN + uint16_t swap; + swap = ((( val << 8 ) & 0xff00 ) | (( val >> 8 ) & 0x00ff ) ); + return os.write(reinterpret_cast(&swap), 2); +#else + return os.write(reinterpret_cast(&val), 2); +#endif //GDCM_WORDS_BIGENDIAN +} + +/** + * \brief binary_write binary_write + * @param os ostream to write to + * @param val val + */ +std::ostream &binary_write(std::ostream &os, const uint32_t &val) +{ +#ifdef GDCM_WORDS_BIGENDIAN + uint32_t swap; + swap = ( ((val<<24) & 0xff000000) | ((val<<8) & 0x00ff0000) | + ((val>>8) & 0x0000ff00) | ((val>>24) & 0x000000ff) ); + return os.write(reinterpret_cast(&swap), 4); +#else + return os.write(reinterpret_cast(&val), 4); +#endif //GDCM_WORDS_BIGENDIAN +} + +/** + * \brief binary_write binary_write + * @param os ostream to write to + * @param val val + */ +std::ostream &binary_write(std::ostream &os, const char *val) +{ + return os.write(val, strlen(val)); +} + +/** + * \brief + * @param os ostream to write to + * @param val val + */ +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(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> 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(val), len); +#endif +} + +//------------------------------------------------------------------------- +// Protected + +//------------------------------------------------------------------------- +// Private +/** * \brief Return the IP adress of the machine writting the DICOM image */ std::string Util::GetIPAddress() @@ -693,11 +946,11 @@ std::string Util::GetIPAddress() // SUSv2 guarantees that `Host names are limited to 255 bytes'. // POSIX 1003.1-2001 guarantees that `Host names (not including the // terminating NUL) are limited to HOST_NAME_MAX bytes'. -# define HOST_NAME_MAX 255 +#define HOST_NAME_MAX 255 // In this case we should maybe check the string was not truncated. // But I don't known how to check that... -#if defined(_MSC_VER) || defined(__BORLANDC__) - // with WinSock DLL we need to initialise the WinSock before using gethostname +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + // with WinSock DLL we need to initialize the WinSock before using gethostname WORD wVersionRequested = MAKEWORD(1,0); WSADATA WSAData; int err = WSAStartup(wVersionRequested,&WSAData); @@ -732,7 +985,7 @@ std::string Util::GetIPAddress() } // str now contains one local IP address -#if defined(_MSC_VER) || defined(__BORLANDC__) +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) WSACleanup(); #endif @@ -743,71 +996,6 @@ std::string Util::GetIPAddress() return str; } -/** - * \ingroup Util - * \brief Creates a new UID. As stipulate in the DICOM ref - * each time a DICOM image is create it should have - * a unique identifier (URI) - */ -std::string Util::CreateUniqueUID(const std::string &root) -{ - std::string radical = root; - if( !root.size() ) - { - // No root was specified use "GDCM" then - // echo "gdcm" | od -b - // 0000000 147 144 143 155 012 - radical = "147.144.143.155"; // special easter egg - } - // else - // A root was specified use it to forge our new UID: - radical += Util::GetMACAddress(); - radical += "."; - radical += Util::GetCurrentDate(); - radical += "."; - radical += Util::GetCurrentTime(); - - return radical; -} - -template -std::ostream &binary_write(std::ostream &os, const T &val) -{ - return os.write(reinterpret_cast(&val), sizeof val); -} - -std::ostream &binary_write(std::ostream &os, const uint16_t &val) -{ -#ifdef GDCM_WORDS_BIGENDIAN - uint16_t swap; - swap = ((( val << 8 ) & 0x0ff00 ) | (( val >> 8 ) & 0x00ff ) ); - return os.write(reinterpret_cast(&swap), 2); -#else - return os.write(reinterpret_cast(&val), 2); -#endif //GDCM_WORDS_BIGENDIAN -} - -std::ostream &binary_write(std::ostream &os, const uint32_t &val) -{ -#ifdef GDCM_WORDS_BIGENDIAN - uint32_t swap; - swap = ( ((val<<24) & 0xff000000) | ((val<<8) & 0x00ff0000) | - ((val>>8) & 0x0000ff00) | ((val>>24) & 0x000000ff) ); - return os.write(reinterpret_cast(&swap), 4); -#else - return os.write(reinterpret_cast(&val), 4); -#endif //GDCM_WORDS_BIGENDIAN -} - -std::ostream &binary_write(std::ostream &os, const char *val) -{ - return os.write(val, strlen(val)); -} - -std::ostream &binary_write(std::ostream &os, std::string const &val) -{ - return os.write(val.c_str(), val.size()); -} - +//------------------------------------------------------------------------- } // end namespace gdcm