X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmUtil.cxx;h=19895c1f4e960b4b09ff98135f55a897a9d7d5a3;hb=0e88aff6bcac1c201b50acb285ba079f3a6b1a6c;hp=7ba0e2bf83a000d014f8008d83ed062cd18a0f98;hpb=cac8f308365b0b699f01063395715550daae3a3e;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index 7ba0e2bf..19895c1f 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/10/24 21:31:11 $ - Version: $Revision: 1.167 $ + Date: $Date: 2006/01/10 15:54:03 $ + Version: $Revision: 1.182 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,18 +18,18 @@ #include "gdcmUtil.h" #include "gdcmDebug.h" + #include +#include // for va_list // For GetCurrentDate, GetCurrentTime #include #include #include -// Two approaches, *NIX or Win32 -#ifdef CMAKE_HAVE_SYS_TIMEB_H +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) #include -#endif -#ifdef CMAKE_HAVE_SYS_TIMES_H +#else #include #endif @@ -112,7 +112,7 @@ std::string Util::GDCM_MAC_ADRESS = GetMACAddress(); /** * \brief Provide a better 'c++' approach for sprintf * For example c code is: - * char result[200]; // hope 200 is enough + * char result[2048]; // hope 2048 is enough * sprintf(result, "%04x|%04x", group , elem); * * c++ code is @@ -128,7 +128,7 @@ std::string Util::GDCM_MAC_ADRESS = GetMACAddress(); */ std::string Util::Format(const char *format, ...) { - char buffer[2048]; + char buffer[2048]; // hope 2048 is enough va_list args; va_start(args, format); vsprintf(buffer, format, args); //might be a security flaw @@ -194,10 +194,8 @@ int Util::CountSubstring (const std::string &str, */ bool Util::IsCleanString(std::string const &s) { - std::cout<< std::endl << s << std::endl; for(unsigned int i=0; i pos2 ) @@ -314,7 +321,9 @@ std::string Util::GetPath(std::string const &fullName) { res.resize(pos2); } - +*/ + int pos = res.rfind(GDCM_FILESEPARATOR); + res.resize(pos); return res; } @@ -325,10 +334,14 @@ std::string Util::GetPath(std::string const &fullName) std::string Util::GetName(std::string const &fullName) { std::string filename = 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; + // At least with my gcc4.0.1, unfound char results in pos =4294967295 ... + //slash_pos = slash_pos > backslash_pos ? slash_pos : backslash_pos; + slash_pos = slash_pos < backslash_pos ? slash_pos : backslash_pos; +*/ + std::string::size_type slash_pos = filename.rfind(GDCM_FILESEPARATOR); if (slash_pos != std::string::npos ) { return filename.substr(slash_pos + 1); @@ -484,8 +497,8 @@ std::string Util::DicomString(const char *s) /** * \brief Safely check the equality of two Dicom String: * - Both strings should be of even length - * - We allow padding of even length string by either a null - * character of a space + * - 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) { @@ -502,8 +515,8 @@ bool Util::DicomStringEqual(const std::string &s1, const char *s2) /** * \brief Safely compare two Dicom String: * - Both strings should be of even length - * - We allow padding of even length string by either a null - * character of a space + * - We allow padding of even length string by either + * a null character of a space */ bool Util::CompareDicomString(const std::string &s1, const char *s2, int op) { @@ -815,8 +828,8 @@ int GetMacAddrSys ( unsigned char *addr ) } close(sd); #endif - // Not implemented platforms - perror("in Get MAC Adress (internal) : There was a configuration problem on your plateform"); + // Not implemented platforms (or no cable !) + perror("in Get MAC Adress (internal) : There was a configuration problem (or no cable !) on your plateform"); memset(addr,0,6); return -1; #endif //__sun @@ -840,7 +853,7 @@ inline int getlastdigit(unsigned char *data) } /** - * \brief Encode the mac address on a fixed lenght string of 15 characters. + * \brief Encode the mac address on a fixed length string of 15 characters. * we save space this way. */ std::string Util::GetMACAddress() @@ -873,14 +886,14 @@ std::string Util::GetMACAddress() } else { - gdcmWarningMacro("Problem in finding the MAC Address"); + gdcmStaticWarningMacro("Problem in finding the MAC Address"); return ""; } } /** - * \brief Creates a new UID. As stipulate in the DICOM ref - * each time a DICOM image is create it should have + * \brief Creates a new UID. As stipulated in the DICOM ref + * each time a DICOM image is created it should have * a unique identifier (URI) * @param root is the DICOM prefix assigned by IOS group */ @@ -915,7 +928,7 @@ std::string Util::CreateUniqueUID(const std::string &root) // If append is too long we need to rehash it if ( (prefix + append).size() > 64 ) { - gdcmErrorMacro( "Size of UID is too long." ); + gdcmStaticErrorMacro( "Size of UID is too long." ); // we need a hash function to truncate this number // if only md5 was cross plateform // MD5(append); @@ -941,7 +954,7 @@ const std::string &Util::GetRootUID() /** * \brief binary_write binary_write * @param os ostream to write to - * @param val val + * @param val 16 bits value to write */ std::ostream &binary_write(std::ostream &os, const uint16_t &val) { @@ -958,7 +971,7 @@ std::ostream &binary_write(std::ostream &os, const uint16_t &val) /** * \brief binary_write binary_write * @param os ostream to write to - * @param val val + * @param val 32 bits value to write */ std::ostream &binary_write(std::ostream &os, const uint32_t &val) { @@ -972,10 +985,39 @@ std::ostream &binary_write(std::ostream &os, const uint32_t &val) #endif //GDCM_WORDS_BIGENDIAN } + +/** + * \brief binary_write binary_write + * @param os ostream to write to + * @param val double (64 bits) value to write + */ +std::ostream &binary_write(std::ostream &os, const double &val) +{ +#if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION) + double swap = val; + + char *beg = (char *)&swap; + char *end = beg + 7; + char t; + for (unsigned int i = 0; i<7; i++) + { + t = *beg; + *beg = *end; + *end = t; + beg++, + end--; + } + return os.write(reinterpret_cast(&swap), 8); +#else + return os.write(reinterpret_cast(&val), 8); +#endif //GDCM_WORDS_BIGENDIAN +} + + /** * \brief binary_write binary_write * @param os ostream to write to - * @param val val + * @param val 8 bits characters aray to write */ std::ostream &binary_write(std::ostream &os, const char *val) { @@ -983,9 +1025,9 @@ std::ostream &binary_write(std::ostream &os, const char *val) } /** - * \brief + * \brief binary_write binary_write * @param os ostream to write to - * @param val val + * @param val std::string value to write */ std::ostream &binary_write(std::ostream &os, std::string const &val) { @@ -995,7 +1037,7 @@ std::ostream &binary_write(std::ostream &os, std::string const &val) /** * \brief binary_write binary_write * @param os ostream to write to - * @param val value + * @param val 8 bits 'characters' aray to write * @param len length of the 'value' to be written */ std::ostream &binary_write(std::ostream &os, const uint8_t *val, size_t len) @@ -1007,8 +1049,8 @@ 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 + * @param val 16 bits words aray to write + * @param len length (in bytes) of the 'value' to be written */ std::ostream &binary_write(std::ostream &os, const uint16_t *val, size_t len) { @@ -1119,6 +1161,14 @@ std::string Util::GetIPAddress() return str; } +void Util::hfpswap(double *a, double *b) +{ + double tmp; + tmp=*a; + *a=*b; + *b=tmp; +} + //------------------------------------------------------------------------- } // end namespace gdcm