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

Suppress some clang warnings.

Browse Source
This commit is contained in:
Syoyo Fujita
2017-06-05 02:00:32 +09:00
parent d8f702c6f7
commit 99518b6d3e
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tiny_obj_loader.h
View File

@@ -177,7 +177,6 @@ typedef struct {
real_t anisotropy; // aniso. [0, 1] default 0 real_t anisotropy; // aniso. [0, 1] default 0
real_t anisotropy_rotation; // anisor. [0, 1] default 0 real_t anisotropy_rotation; // anisor. [0, 1] default 0
real_t pad0; real_t pad0;
real_t pad1;
std::string roughness_texname; // map_Pr std::string roughness_texname; // map_Pr
std::string metallic_texname; // map_Pm std::string metallic_texname; // map_Pm
std::string sheen_texname; // map_Ps std::string sheen_texname; // map_Ps
@@ -418,6 +417,8 @@ static std::istream &safeGetline(std::istream &is, std::string &t) {
} }
} }
} }
return is;
} }
#define IS_SPACE(x) (((x) == ' ') || ((x) == '\t')) #define IS_SPACE(x) (((x) == ' ') || ((x) == '\t'))
@@ -1030,9 +1031,11 @@ void LoadMtl(std::map<std::string, int> *material_map,
// set new mtl name // set new mtl name
token += 7; token += 7;
std::stringstream ss; {
ss << token; std::stringstream sstr;
material.name = ss.str(); sstr << token;
material.name = sstr.str();
}
continue; continue;
} }
@@ -1688,9 +1691,9 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
tag.stringValues.resize(static_cast<size_t>(ts.num_strings)); tag.stringValues.resize(static_cast<size_t>(ts.num_strings));
for (size_t i = 0; i < static_cast<size_t>(ts.num_strings); ++i) { for (size_t i = 0; i < static_cast<size_t>(ts.num_strings); ++i) {
std::stringstream ss; std::stringstream sstr;
ss << token; sstr << token;
tag.stringValues[i] = ss.str(); tag.stringValues[i] = sstr.str();
token += tag.stringValues[i].size() + 1; token += tag.stringValues[i].size() + 1;
} }