X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=d36add49ee6f54065a17d49f20769ac6e46b9b95;hb=8ec2c436833d0ee32de2bd0128045f859cf8d1eb;hp=64562315c175020eda0d3480eed3b2d2407c1ade;hpb=40f0708d21ca92b35385f00e44f671eb7bef37d0;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index 64562315..d36add49 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/02/11 19:09:30 $ - Version: $Revision: 1.136 $ + Date: $Date: 2005/06/24 10:55:59 $ + Version: $Revision: 1.155 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -34,15 +34,15 @@ #include //only included in implementation file #include //only included in implementation file -#if defined(_MSC_VER) || defined(__MINGW32__) - #include // for gethostname and gethostbyname +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + #include // for gethostname and gethostbyname and GetTickCount... +#ifndef __BORLANDC__ #undef GetCurrentTime +#endif #else -#ifndef __BORLANDC__ #include // for gethostname #include // for gethostbyname #endif -#endif // For GetMACAddress #ifdef _WIN32 @@ -92,13 +92,17 @@ 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; +std::string Util::GDCM_MAC_ADRESS = GetMACAddress(); //------------------------------------------------------------------------- // Public /** * \brief Provide a better 'c++' approach for sprintf * For example c code is: - * sprintf(trash, "%04x|%04x", group , elem); + * char result[200]; // hope 200 is enough + * sprintf(result, "%04x|%04x", group , elem); * * c++ code is * std::ostringstream buf; @@ -108,7 +112,8 @@ std::string Util::RootUID = GDCM_UID; * buf.str(); * * gdcm style code is - * Format("%04x|%04x", group , elem); + * string result; + * result = gdcm::Util::Format("%04x|%04x", group , elem); */ std::string Util::Format(const char *format, ...) { @@ -125,6 +130,10 @@ std::string Util::Format(const char *format, ...) /** * \brief Because not available in C++ (?) + * @param str string to check + * @param tokens std::vector to receive the tokenized substrings + * @param delimiters string containing the character delimitors + */ void Util::Tokenize (const std::string &str, std::vector &tokens, @@ -143,24 +152,26 @@ void Util::Tokenize (const std::string &str, /** * \brief Because not available in C++ (?) * Counts the number of occurences of a substring within a string + * @param str string to check + * @param subStr substring to count */ int Util::CountSubstring (const std::string &str, const std::string &subStr) { - int count = 0; // counts how many times it appears - std::string::size_type x = 0; // The index position in the string + int count = 0; // counts how many times it appears + std::string::size_type x = 0; // The index position in the string do { - x = str.find(subStr,x); // Find the substring - if (x != std::string::npos) // If present + x = str.find(subStr,x); // Find the substring + if (x != std::string::npos) // If present { - count++; // increase the count - x += subStr.length(); // Skip this word + count++; // increase the count + x += subStr.length(); // Skip this word } } - while (x != std::string::npos); // Carry on until not present + while (x != std::string::npos);// Carry on until not present return count; } @@ -176,17 +187,17 @@ std::string Util::CreateCleanString(std::string const &s) for(unsigned int i=0; i 0) + if (str.size() > 0 ) { - if(!isprint((unsigned char)s[str.size()-1])) + if (!isprint((unsigned char)s[str.size()-1]) ) { - if(s[str.size()-1] == 0) + if (s[str.size()-1] == 0 ) { str[str.size()-1] = ' '; } @@ -208,7 +219,7 @@ std::string Util::NormalizePath(std::string const &pathname) std::string name = pathname; int size = name.size(); - if( name[size-1] != SEPARATOR_X && name[size-1] != SEPARATOR_WIN ) + if ( name[size-1] != SEPARATOR_X && name[size-1] != SEPARATOR_WIN ) { name += SEPARATOR; } @@ -224,7 +235,7 @@ std::string Util::GetPath(std::string const &fullName) std::string res = fullName; int pos1 = res.rfind("/"); int pos2 = res.rfind("\\"); - if( pos1 > pos2) + if ( pos1 > pos2 ) { res.resize(pos1); } @@ -247,7 +258,7 @@ std::string Util::GetName(std::string const &fullName) std::string::size_type slash_pos = filename.rfind("/"); std::string::size_type backslash_pos = filename.rfind("\\"); slash_pos = slash_pos > backslash_pos ? slash_pos : backslash_pos; - if(slash_pos != std::string::npos) + if (slash_pos != std::string::npos ) { return filename.substr(slash_pos + 1); } @@ -310,10 +321,11 @@ std::string Util::GetCurrentDateTime() 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() @@ -321,18 +333,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() @@ -351,7 +365,7 @@ unsigned int Util::GetCurrentProcessID() */ bool Util::IsCurrentProcessorBigEndian() { -#ifdef GDCM_WORDS_BIGENDIAN +#if defined(GDCM_WORDS_BIGENDIAN) return true; #else return false; @@ -377,7 +391,7 @@ std::string Util::DicomString(const char *s, size_t l) * \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*), @@ -387,7 +401,7 @@ std::string Util::DicomString(const char *s, size_t l) std::string Util::DicomString(const char *s) { size_t l = strlen(s); - if( l%2 ) + if ( l%2 ) { l++; } @@ -407,7 +421,7 @@ bool Util::DicomStringEqual(const std::string &s1, const char *s2) // s2 is the string from the DICOM reference: 'MONOCHROME1' std::string s1_even = s1; //Never change input parameter std::string s2_even = DicomString( s2 ); - if( s1_even[s1_even.size()-1] == ' ') + if ( s1_even[s1_even.size()-1] == ' ' ) { s1_even[s1_even.size()-1] = '\0'; //replace space character by null } @@ -438,11 +452,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; @@ -567,7 +582,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; @@ -577,7 +592,7 @@ int GetMacAddrSys ( unsigned char *addr ) char **paddrs; int sock, status=0; - if(gethostname(hostname, MAXHOSTNAMELEN) != 0) + if (gethostname(hostname, MAXHOSTNAMELEN) != 0 ) { perror("gethostname"); return -1; @@ -586,7 +601,7 @@ int GetMacAddrSys ( unsigned char *addr ) paddrs = phost->h_addr_list; sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); - if(sock == -1) + if (sock == -1 ) { perror("sock"); return -1; @@ -599,7 +614,7 @@ int GetMacAddrSys ( unsigned char *addr ) memcpy(&psa->sin_addr, *paddrs, sizeof(struct in_addr)); status = ioctl(sock, SIOCGARP, &parpreq); - if(status == -1) + if (status == -1 ) { perror("SIOCGARP"); return -1; @@ -636,7 +651,7 @@ int GetMacAddrSys ( unsigned char *addr ) #define ifreq_size(i) sizeof(struct ifreq) #endif // HAVE_SA_LEN - if( (sd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0 ) + if ( (sd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0 ) { return -1; } @@ -741,7 +756,8 @@ std::string Util::GetMACAddress() { 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); + zero = (addr[0] == 0) && (addr[1] == 0) && (addr[2] == 0) + && (addr[3] == 0) && (addr[4] == 0) && (addr[5] == 0); } return sres; @@ -763,7 +779,7 @@ std::string Util::CreateUniqueUID(const std::string &root) { std::string prefix; std::string append; - if( root.empty() ) + if ( root.empty() ) { // gdcm UID prefix, as supplied by http://www.medicalconnections.co.uk prefix = RootUID; @@ -775,16 +791,20 @@ std::string Util::CreateUniqueUID(const std::string &root) // 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 ) + if ( (prefix + append).size() > 64 ) { gdcmErrorMacro( "Size of UID is too long." ); // we need a hash function to truncate this number @@ -797,7 +817,7 @@ std::string Util::CreateUniqueUID(const std::string &root) void Util::SetRootUID(const std::string &root) { - if( root.empty() ) + if ( root.empty() ) RootUID = GDCM_UID; else RootUID = root; @@ -809,17 +829,6 @@ const std::string &Util::GetRootUID() } //------------------------------------------------------------------------- -/** - * \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 @@ -827,9 +836,12 @@ 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 ) ); + //swap = ((( val << 8 ) & 0xff00 ) | (( val >> 8 ) & 0x00ff ) ); + //save CPU time + swap = ( val << 8 | val >> 8 ); + return os.write(reinterpret_cast(&swap), 2); #else return os.write(reinterpret_cast(&val), 2); @@ -843,10 +855,13 @@ 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) ); +// swap = ( ((val<<24) & 0xff000000) | ((val<<8) & 0x00ff0000) | +// ((val>>8) & 0x0000ff00) | ((val>>24) & 0x000000ff) ); +// save CPU time + swap = ( (val<<24) | ((val<<8) & 0x00ff0000) | + ((val>>8) & 0x0000ff00) | (val>>24) ); return os.write(reinterpret_cast(&swap), 4); #else return os.write(reinterpret_cast(&val), 4); @@ -876,7 +891,8 @@ std::ostream &binary_write(std::ostream &os, std::string const &val) /** * \brief binary_write binary_write * @param os ostream to write to - * @param val val + * @param val value + * @param len length of the 'value' to be written */ std::ostream &binary_write(std::ostream &os, const uint8_t *val, size_t len) { @@ -888,16 +904,18 @@ std::ostream &binary_write(std::ostream &os, const uint8_t *val, size_t len) * \brief binary_write binary_write * @param os ostream to write to * @param val val + * @param len length of the 'value' to be written */ 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 +// 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 +// intermediate result before writting it. +#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 = val; + 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) @@ -905,26 +923,27 @@ std::ostream &binary_write(std::ostream &os, const uint16_t *val, size_t len) for (int j=0;j> 8) | (binArea16[i] << 8); - uint16_t val16 = binArea16[i]; - buffer[i] = ((( val16 << 8 ) & 0xff00 ) | (( val16 >> 8 ) & 0x00ff ) ); + *pbuffer = *binArea16 >> 8 | *binArea16 << 8; + pbuffer++; + binArea16++; } - fp->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++) { - //buffer[i] = (binArea16[i] >> 8) | (binArea16[i] << 8); - uint16_t val16 = binArea16[i]; - buffer[i] = ((( val16 << 8 ) & 0xff00 ) | (( val16 >> 8 ) & 0x00ff ) ); + *pbuffer = *binArea16 >> 8 | *binArea16 << 8; + pbuffer++; + binArea16++; } - fp->write ( (char*)buffer, remainingSize ); + os.write ( buffer, remainingSize ); } - delete[] buffer; + return os; #else return os.write(reinterpret_cast(val), len); #endif @@ -969,7 +988,7 @@ std::string Util::GetIPAddress() char szHostName[HOST_NAME_MAX+1]; int r = gethostname(szHostName, HOST_NAME_MAX); - if( r == 0 ) + if ( r == 0 ) { // Get host adresses struct hostent *pHost = gethostbyname(szHostName); @@ -978,7 +997,7 @@ std::string Util::GetIPAddress() { for( int j = 0; jh_length; j++ ) { - if( j > 0 ) str += "."; + if ( j > 0 ) str += "."; str += Util::Format("%u", (unsigned int)((unsigned char*)pHost->h_addr_list[i])[j]);