Commit b74e1bd7 authored by Matthias Möller's avatar Matthias Möller

fix cppcheck

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1272 fdac6126-5c0c-442c-9429-916003d36597
parent 030ef9b9
...@@ -455,8 +455,6 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap ...@@ -455,8 +455,6 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap
return false; return false;
} }
unsigned int i, j, k, l, idx;
unsigned int nV;
OpenMesh::Vec3f v, n; // Vertex OpenMesh::Vec3f v, n; // Vertex
OpenMesh::Vec2f t; // TexCoords OpenMesh::Vec2f t; // TexCoords
BaseImporter::VHandles vhandles; BaseImporter::VHandles vhandles;
...@@ -467,7 +465,7 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap ...@@ -467,7 +465,7 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap
_bi.reserve(vertexCount_, 3* vertexCount_ , faceCount_); _bi.reserve(vertexCount_, 3* vertexCount_ , faceCount_);
// read vertices: // read vertices:
for (i = 0; i < vertexCount_ && !_in.eof(); ++i) { for (unsigned int i = 0; i < vertexCount_ && !_in.eof(); ++i) {
v[0] = 0.0; v[0] = 0.0;
v[1] = 0.0; v[1] = 0.0;
v[2] = 0.0; v[2] = 0.0;
...@@ -566,12 +564,14 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap ...@@ -566,12 +564,14 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap
if(!faceProperties_.empty()) if(!faceProperties_.empty())
{ {
for (i = 0; i < faceCount_; ++i) { for (unsigned int i = 0; i < faceCount_; ++i) {
// Read number of vertices for the current face // Read number of vertices for the current face
unsigned int nV;
readValue(faceProperties_[0].listIndexType, _in, nV); readValue(faceProperties_[0].listIndexType, _in, nV);
if (nV == 3) { if (nV == 3) {
vhandles.resize(3); vhandles.resize(3);
unsigned int j,k,l;
readInteger(faceProperties_[0].value, _in, j); readInteger(faceProperties_[0].value, _in, j);
readInteger(faceProperties_[0].value, _in, k); readInteger(faceProperties_[0].value, _in, k);
readInteger(faceProperties_[0].value, _in, l); readInteger(faceProperties_[0].value, _in, l);
...@@ -581,7 +581,8 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap ...@@ -581,7 +581,8 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap
vhandles[2] = VertexHandle(l); vhandles[2] = VertexHandle(l);
} else { } else {
vhandles.clear(); vhandles.clear();
for (j = 0; j < nV; ++j) { for (unsigned int j = 0; j < nV; ++j) {
unsigned int idx;
readInteger(faceProperties_[0].value, _in, idx); readInteger(faceProperties_[0].value, _in, idx);
vhandles.push_back(VertexHandle(idx)); vhandles.push_back(VertexHandle(idx));
} }
......
Markdown is supported
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