diff --git a/src/OpenMesh/Core/IO/reader/BaseReader.hh b/src/OpenMesh/Core/IO/reader/BaseReader.hh index 4f79c6eb..2befefc2 100644 --- a/src/OpenMesh/Core/IO/reader/BaseReader.hh +++ b/src/OpenMesh/Core/IO/reader/BaseReader.hh @@ -57,11 +57,7 @@ // STD C++ #include #include -//#include -//#include -//#include -//#include - +#include // OpenMesh #include @@ -137,40 +133,40 @@ protected: }; -///** \brief Trim left whitespace -// * -// * Removes whitespace at the beginning of the string -// * -// * @param _string input string -// * @return trimmed string -// */ -//static inline std::string &left_trim(std::string &_string) { -// _string.erase(_string.begin(), std::find_if(_string.begin(), _string.end(), std::not1(std::ptr_fun(std::isspace)))); -// return _string; -//} -// -///** \brief Trim right whitespace -// * -// * Removes whitespace at the end of the string -// * -// * @param _string input string -// * @return trimmed string -// */ -//static inline std::string &right_trim(std::string &_string) { -// _string.erase(std::find_if(_string.rbegin(), _string.rend(), std::not1(std::ptr_fun(std::isspace))).base(), _string.end()); -// return _string; -//} -// -///** \brief Trim whitespace -// * -// * Removes whitespace at the beginning and end of the string -// * -// * @param _string input string -// * @return trimmed string -// */ -//static inline std::string &trim(std::string &_string) { -// return left_trim(right_trim(_string)); -//} +/** \brief Trim left whitespace + * + * Removes whitespace at the beginning of the string + * + * @param _string input string + * @return trimmed string + */ +static inline std::string &left_trim(std::string &_string) { + _string.erase(_string.begin(), std::find_if(_string.begin(), _string.end(), std::not1(std::ptr_fun(std::isspace)))); + return _string; +} + +/** \brief Trim right whitespace + * + * Removes whitespace at the end of the string + * + * @param _string input string + * @return trimmed string + */ +static inline std::string &right_trim(std::string &_string) { + _string.erase(std::find_if(_string.rbegin(), _string.rend(), std::not1(std::ptr_fun(std::isspace))).base(), _string.end()); + return _string; +} + +/** \brief Trim whitespace + * + * Removes whitespace at the beginning and end of the string + * + * @param _string input string + * @return trimmed string + */ +static inline std::string &trim(std::string &_string) { + return left_trim(right_trim(_string)); +} diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.cc b/src/OpenMesh/Core/IO/reader/PLYReader.cc index df016244..d92c7cde 100644 --- a/src/OpenMesh/Core/IO/reader/PLYReader.cc +++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc @@ -844,7 +844,7 @@ bool _PLYReader_::can_u_read(std::istream& _is) const { // read 1st line std::string line; std::getline(_is, line); - //trim(line); + trim(line); //Check if this file is really a ply format if (line != "PLY" && line != "ply")