Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable trimming as it does not build on windows

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@469 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2011-11-28 10:57:28 +00:00
parent 0e08dce166
commit 300b400a45
2 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/OpenMesh/Core/IO/reader/BaseReader.hh
View File

@@ -58,7 +58,7 @@
#include <iostream> #include <iostream>
#include <string> #include <string>
//#include <ctype.h> //#include <ctype.h>
#include <locale> //#include <locale>
//#include <algorithm> //#include <algorithm>
//#include <functional> //#include <functional>
@@ -137,40 +137,40 @@ protected:
}; };
/** \brief Trim left whitespace ///** \brief Trim left whitespace
* // *
* Removes whitespace at the beginning of the string // * Removes whitespace at the beginning of the string
* // *
* @param _string input string // * @param _string input string
* @return trimmed string // * @return trimmed string
*/ // */
static inline std::string &left_trim(std::string &_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<int, int>(std::isspace)))); // _string.erase(_string.begin(), std::find_if(_string.begin(), _string.end(), std::not1(std::ptr_fun<int, int>(std::isspace))));
return _string; // return _string;
} //}
//
/** \brief Trim right whitespace ///** \brief Trim right whitespace
* // *
* Removes whitespace at the end of the string // * Removes whitespace at the end of the string
* // *
* @param _string input string // * @param _string input string
* @return trimmed string // * @return trimmed string
*/ // */
static inline std::string &right_trim(std::string &_string) { //static inline std::string &right_trim(std::string &_string) {
_string.erase(std::find_if(_string.rbegin(), _string.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), _string.end()); // _string.erase(std::find_if(_string.rbegin(), _string.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), _string.end());
return _string; // return _string;
} //}
//
/** \brief Trim whitespace ///** \brief Trim whitespace
* // *
* Removes whitespace at the beginning and end of the string // * Removes whitespace at the beginning and end of the string
* // *
* @param _string input string // * @param _string input string
* @return trimmed string // * @return trimmed string
*/ // */
static inline std::string &trim(std::string &_string) { //static inline std::string &trim(std::string &_string) {
return left_trim(right_trim(_string)); // return left_trim(right_trim(_string));
} //}

2
src/OpenMesh/Core/IO/reader/PLYReader.cc
View File

@@ -844,7 +844,7 @@ bool _PLYReader_::can_u_read(std::istream& _is) const {
// read 1st line // read 1st line
std::string line; std::string line;
std::getline(_is, line); std::getline(_is, line);
trim(line); //trim(line);
//Check if this file is really a ply format //Check if this file is really a ply format
if (line != "PLY" && line != "ply") if (line != "PLY" && line != "ply")