diff options
| author | Marius Kintel <marius@kintel.net> | 2013-06-18 05:46:48 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-06-18 05:46:48 (GMT) |
| commit | 6d91540e4cc3f9fe0caaea63ac64518a5626d28b (patch) | |
| tree | ca7034453a1f55124e4b7378aaab22985aff6a21 /src/import.cc | |
| parent | 95947a877b8e88521a7f00348d56c89e9b7c2a79 (diff) | |
| parent | 6c7d386a3338039416ced323bf1aa75edbb43d19 (diff) | |
Merge branch 'master' into epec-kernel
Diffstat (limited to 'src/import.cc')
| -rw-r--r-- | src/import.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/import.cc b/src/import.cc index 2180684..b5d67d2 100644 --- a/src/import.cc +++ b/src/import.cc @@ -204,7 +204,7 @@ PolySet *ImportNode::evaluate_polyset(class PolySetEvaluator *) const boost::regex ex_vertices("\\s*vertex\\s+([^\\s]+)\\s+([^\\s]+)\\s+([^\\s]+)"); bool binary = false; - int file_size = f.tellg(); + std::streampos file_size = f.tellg(); f.seekg(80); if (!f.eof()) { uint32_t facenum = 0; |