X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=a9900f468c231bb9e68ae8902e5112835b298da6;hb=2d43f5c8ae2004242af2297ceb2926d81675548f;hp=2b59ead196c478d29db85dfdd86ccb9c6dc3c691;hpb=fd37aa842b5d31ca266b6bda8a77f3201d02338d;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index 2b59ead1..a9900f46 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmUtil.cxx,v $ Language: C++ - Date: $Date: 2004/09/27 08:39:08 $ - Version: $Revision: 1.50 $ + Date: $Date: 2004/10/28 22:21:57 $ + Version: $Revision: 1.57 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,36 +18,49 @@ #include "gdcmUtil.h" #include "gdcmDebug.h" -#include -#include // For isspace -#include // CLEANME: could this be only string ? Related to Win32 ? -#include + +#include //only included in implementation file +#include //only included in implementation file + +namespace gdcm +{ /** * \ingroup Globals - * \brief Because is not yet available in g++2.96 + * \brief Provide a better 'c++' approach for sprintf + * For example c code is: + * sprintf(trash, "%04x|%04x", group , element); + * + * c++ is + * std::ostringstream buf; + * buf << std::right << std::setw(4) << std::setfill('0') << std::hex + * << group << "|" << std::right << std::setw(4) << std::setfill('0') + * << std::hex << element; + * buf.str(); */ -std::istream& eatwhite(std::istream& is) { - char c; - while (is.get(c)) { - if (!isspace(c)) { - is.putback(c); - break; - } - } - return is; + +std::string Util::Format(const char* format, ...) +{ + char buffer[2048]; + va_list args; + va_start(args, format); + vsprintf(buffer, format, args); //might be a security flaw + return buffer; } + /** * \ingroup Globals * \brief Because not available in C++ (?) */ -void Tokenize (const std::string& str, - std::vector& tokens, - const std::string& delimiters) { +void Util::Tokenize (const std::string& str, + std::vector& tokens, + 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); - while (std::string::npos != pos || std::string::npos != lastPos) { + while (std::string::npos != pos || std::string::npos != lastPos) + { tokens.push_back(str.substr(lastPos, pos - lastPos)); lastPos = str.find_first_not_of(delimiters, pos); pos = str.find_first_of (delimiters, lastPos); @@ -60,18 +73,21 @@ void Tokenize (const std::string& str, * Counts the number of occurences of a substring within a string */ - int CountSubstring (const std::string& str, - const std::string& subStr) { +int Util::CountSubstring (const std::string& str, + const std::string& subStr) +{ int count = 0; // counts how many times it appears unsigned int x = 0; // The index position in the string do - { x = str.find(subStr,x); // Find the substring + { + 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 return count; @@ -83,19 +99,28 @@ void Tokenize (const std::string& str, * to avoid corrupting the terminal of invocation when printing) * @param s string to remove non printable characters from */ -std::string CreateCleanString(std::string s) { - std::string str=s; +std::string Util::CreateCleanString(std::string const & s) +{ + std::string str = s; for(unsigned int i=0;i0) + { if(!isprint(s[str.size()-1])) + { if(s[str.size()-1]==0) + { str[str.size()-1]=' '; + } + } + } return str; } @@ -105,17 +130,19 @@ std::string CreateCleanString(std::string s) { * \brief Add a SEPARATOR to the end of the name is necessary * @param name file/directory name to normalize */ -void NormalizePath(std::string &name) +std::string Util::NormalizePath(std::string const & pathname) { const char SEPARATOR_X = '/'; const char SEPARATOR_WIN = '\\'; const std::string SEPARATOR = "/"; - int size=name.size(); + 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; + name += SEPARATOR; } + return name; } /** @@ -123,19 +150,21 @@ void NormalizePath(std::string &name) * \brief Get the (directory) path from a full path file name * @param fullName file/directory name to extract Path from */ -std::string GetPath(std::string &fullName) +std::string Util::GetPath(std::string const & fullName) { - int pos1 = fullName.rfind("/"); - int pos2 = fullName.rfind("\\"); + std::string res = fullName; + int pos1 = res.rfind("/"); + int pos2 = res.rfind("\\"); if( pos1 > pos2) { - fullName.resize(pos1); + res.resize(pos1); } else { - fullName.resize(pos2); + res.resize(pos2); } - return fullName; + + return res; } /** @@ -143,23 +172,59 @@ std::string GetPath(std::string &fullName) * \brief Get the (last) name of a full path file name * @param fullName file/directory name to extract end name from */ -std::string GetName(std::string &fullName) +std::string Util::GetName(std::string const & fullName) { - int fin=fullName.length()-1; - char a =fullName.c_str()[fin]; - if (a == '/' || a == '\\') { - fin--; - } - int deb = 0; - for (int i=fin;i!=0;i--) { - if (fullName.c_str()[i] == '/' || fullName.c_str()[i] == '\\') - break; - deb = i; - } - - std::string lastName; - for (int j=deb;j backslash_pos ? slash_pos : backslash_pos; + if(slash_pos != std::string::npos) + { + return filename.substr(slash_pos + 1); + } + else + { + return filename; + } } + + +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)&0xff) | ((*val&0xff)<<8)); + 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 +} + +//template <> +std::ostream& binary_write(std::ostream& os, const char* val) +{ + return os.write(val, strlen(val)); +} + + +} // end namespace gdcm +