benkyd/tinyobjloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'patch-1' of https://github.com/CoolerExtreme/tinyobjloader into CoolerExtreme-patch-1

Browse Source 
Conflicts:
	tiny_obj_loader.cc
This commit is contained in:
Syoyo Fujita
2015-02-18 12:45:34 +09:00
parent 2cceb53214 011e1b3ebd
commit 285f5b0cfd
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tiny_obj_loader.cc
View File

@@ -80,11 +80,10 @@ static inline int fixIndex(int idx, int n) {
static inline std::string parseString(const char *&token) {
std::string s;
int b = strspn(token, " \t");
token += strspn(token, " \t");
int e = strcspn(token, " \t\r");
s = std::string(&token[b], &token[e]);
token += (e - b);
s = std::string(token, &token[e]);
token += e;
return s;
}