From 300b400a45aae6df2833f333eca38623c9e1afb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 28 Nov 2011 10:57:28 +0000 Subject: [PATCH] Disable trimming as it does not build on windows git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@469 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Core/IO/reader/BaseReader.hh | 70 +++++++++++------------ src/OpenMesh/Core/IO/reader/PLYReader.cc | 2 +- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/OpenMesh/Core/IO/reader/BaseReader.hh b/src/OpenMesh/Core/IO/reader/BaseReader.hh index a0d6321e..4f79c6eb 100644 --- a/src/OpenMesh/Core/IO/reader/BaseReader.hh +++ b/src/OpenMesh/Core/IO/reader/BaseReader.hh @@ -58,7 +58,7 @@ #include #include //#include -#include +//#include //#include //#include @@ -137,40 +137,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 d92c7cde..df016244 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")