Commit 50f8a729 authored by Jan Möbius's avatar Jan Möbius
Browse files

Fixed windows build error

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@11453 383ad7c9-94d9-4d36-a494-682f7c89f535
parent c1000bda
......@@ -748,7 +748,7 @@ bool FileOFFPlugin::checkDegenerateFace(const std::vector<VertexHandle>& _v) {
//-----------------------------------------------------------------------------------------------------
int FileOFFPlugin::getColorType(std::string& _line, bool _texCoordsAvailable) const {
int FileOFFPlugin::getColorType(std::string& _line, bool _texCoordsAvailable) {
/*
0 : no Color
1 : one int (e.g colormap index)
......@@ -764,11 +764,8 @@ int FileOFFPlugin::getColorType(std::string& _line, bool _texCoordsAvailable) co
return 0;
//first remove spaces at start/end of the line
while (std::isspace(_line[0]))
_line = _line.substr(1);
while (std::isspace(_line[ _line.length()-1 ]))
_line = _line.substr(0, _line.length()-1);
trimString(_line);
//count the remaining items in the line
size_t found;
int count = 0;
......
......@@ -148,7 +148,7 @@ class FileOFFPlugin : public QObject, BaseInterface, FileInterface, LoadSaveInte
bool parseBinary(std::istream& _in, OFFImporter& _importer, DataType _type, QString& _objectName);
/// Get color type
int getColorType(std::string& _line, bool _texCoordsAvailable) const;
int getColorType(std::string& _line, bool _texCoordsAvailable);
/// Update user options depending on which options have been selected
/// on the load dialog
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment