X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=6ddba792fd5bcda525715a689687fa3d3d9bb7ff;hb=8d704be3e460a26db22f2d41dbaf02811bc71a45;hp=467777c5609f6510fc822a497a4c7f0680ed63cc;hpb=37fd1bd483d69af97351da7ccbd9ed7912fbaa75;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index 467777c5..6ddba792 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 20:04:08 $ - Version: $Revision: 1.138 $ + 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,13 +92,16 @@ 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 /** * \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 +111,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 +129,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 +151,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; } @@ -321,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() @@ -351,7 +363,7 @@ unsigned int Util::GetCurrentProcessID() */ bool Util::IsCurrentProcessorBigEndian() { -#if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION) +#if defined(GDCM_WORDS_BIGENDIAN) return true; #else return false; @@ -438,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; @@ -567,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; @@ -741,7 +754,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; @@ -818,7 +832,10 @@ std::ostream &binary_write(std::ostream &os, const uint16_t &val) { #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); @@ -834,8 +851,11 @@ std::ostream &binary_write(std::ostream &os, const uint32_t &val) { #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); @@ -865,7 +885,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) { @@ -877,16 +898,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. +// 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 = (uint16_t*)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) @@ -894,26 +917,26 @@ 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++; } - 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++) { - //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++; } - os.write ( (char*)buffer, remainingSize ); + os.write ( buffer, remainingSize ); } - delete[] buffer; return os; #else return os.write(reinterpret_cast(val), len);