From ff2053119e63dfb1fdf7995ed7511aa9af2b6784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Fri, 30 May 2014 10:15:12 +0000 Subject: [PATCH] More cppcheck fixes in OM git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1075 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Core/IO/writer/OFFWriter.cc | 4 +++- src/OpenMesh/Core/IO/writer/PLYWriter.cc | 4 +++- src/Unittests/unittests_add_face.cc | 1 - src/Unittests/unittests_trimesh_circulator_face_face.cc | 1 - 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/OpenMesh/Core/IO/writer/OFFWriter.cc b/src/OpenMesh/Core/IO/writer/OFFWriter.cc index f8473feb..15af3e4e 100644 --- a/src/OpenMesh/Core/IO/writer/OFFWriter.cc +++ b/src/OpenMesh/Core/IO/writer/OFFWriter.cc @@ -491,7 +491,7 @@ binary_size(BaseExporter& _be, Options _opt) const { size_t header(0); size_t data(0); - size_t _3longs(3*sizeof(long)); + size_t _3floats(3*sizeof(float)); size_t _3ui(3*sizeof(unsigned int)); size_t _4ui(4*sizeof(unsigned int)); @@ -500,6 +500,8 @@ binary_size(BaseExporter& _be, Options _opt) const return 0; else { + size_t _3longs(3*sizeof(long)); + header += 11; // 'OFF BINARY\n' header += _3longs; // #V #F #E data += _be.n_vertices() * _3floats; // vertex data diff --git a/src/OpenMesh/Core/IO/writer/PLYWriter.cc b/src/OpenMesh/Core/IO/writer/PLYWriter.cc index 5f550492..85ed2ecd 100644 --- a/src/OpenMesh/Core/IO/writer/PLYWriter.cc +++ b/src/OpenMesh/Core/IO/writer/PLYWriter.cc @@ -535,7 +535,6 @@ binary_size(BaseExporter& _be, Options _opt) const { size_t header(0); size_t data(0); - size_t _3longs(3*sizeof(long)); size_t _3floats(3*sizeof(float)); size_t _3ui(3*sizeof(unsigned int)); size_t _4ui(4*sizeof(unsigned int)); @@ -544,6 +543,9 @@ binary_size(BaseExporter& _be, Options _opt) const return 0; else { + + size_t _3longs(3*sizeof(long)); + header += 11; // 'OFF BINARY\n' header += _3longs; // #V #F #E data += _be.n_vertices() * _3floats; // vertex data diff --git a/src/Unittests/unittests_add_face.cc b/src/Unittests/unittests_add_face.cc index 8f53c82c..4e47f9c9 100644 --- a/src/Unittests/unittests_add_face.cc +++ b/src/Unittests/unittests_add_face.cc @@ -263,7 +263,6 @@ TEST_F(OpenMeshAddFaceTriangleMesh, CreateStrangeConfig) { Mesh::VertexHandle vh[7]; - Mesh::FaceHandle fh[4]; // // 2 x-----------x 1 diff --git a/src/Unittests/unittests_trimesh_circulator_face_face.cc b/src/Unittests/unittests_trimesh_circulator_face_face.cc index b8fc1b5c..2b7cb873 100644 --- a/src/Unittests/unittests_trimesh_circulator_face_face.cc +++ b/src/Unittests/unittests_trimesh_circulator_face_face.cc @@ -258,7 +258,6 @@ TEST_F(OpenMeshTrimeshCirculatorFaceFace, FaceFaceIteratorHandleConversion) { // Get the face via the handle Mesh::FaceHandle faceHandle1 = *face_iter; - const Mesh::Face& face1 = mesh_.face(faceHandle1); EXPECT_EQ(1, faceHandle1.idx() ) << "Wrong face handle index when getting from iterator via handle"; }