From 24bd7be2731de01ea858458e6d4c0664f0cd0a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Fri, 29 Aug 2014 08:28:47 +0000 Subject: [PATCH] Fixed several unused variables git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1150 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Core/IO/reader/PLYReader.cc | 4 ++-- src/OpenMesh/Core/Mesh/PolyConnectivity.cc | 18 +++++++++--------- src/OpenMesh/Tools/Decimater/ModHausdorffT.cc | 2 +- .../unittests_trimesh_circulator_face_face.cc | 2 +- ...unittests_trimesh_circulator_vertex_face.cc | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.cc b/src/OpenMesh/Core/IO/reader/PLYReader.cc index 23be11d5..b85f8a43 100644 --- a/src/OpenMesh/Core/IO/reader/PLYReader.cc +++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc @@ -308,7 +308,7 @@ bool _PLYReader_::read_ascii(std::istream& _in, BaseImporter& _bi, const Options } } - FaceHandle fh = _bi.add_face(vhandles); + _bi.add_face(vhandles); } @@ -456,7 +456,7 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap } } - FaceHandle fh = _bi.add_face(vhandles); + _bi.add_face(vhandles); } return true; diff --git a/src/OpenMesh/Core/Mesh/PolyConnectivity.cc b/src/OpenMesh/Core/Mesh/PolyConnectivity.cc index a099e6ee..105e65e7 100644 --- a/src/OpenMesh/Core/Mesh/PolyConnectivity.cc +++ b/src/OpenMesh/Core/Mesh/PolyConnectivity.cc @@ -340,10 +340,10 @@ bool PolyConnectivity::is_collapse_ok(HalfedgeHandle v0v1) v1v0_triangle = valence(face_handle(v1v0)) == 3; //in a quadmesh we dont have the "next" or "previous" vhandle, so we need to look at previous and next on both sides - VertexHandle v_01_p = from_vertex_handle(prev_halfedge_handle(v0v1)); + //VertexHandle v_01_p = from_vertex_handle(prev_halfedge_handle(v0v1)); VertexHandle v_01_n = to_vertex_handle(next_halfedge_handle(v0v1)); - VertexHandle v_10_p = from_vertex_handle(prev_halfedge_handle(v1v0)); + //VertexHandle v_10_p = from_vertex_handle(prev_halfedge_handle(v1v0)); VertexHandle v_10_n = to_vertex_handle(next_halfedge_handle(v1v0)); //are the vertices already deleted ? @@ -358,12 +358,12 @@ bool PolyConnectivity::is_collapse_ok(HalfedgeHandle v0v1) { if (v0v1_triangle) { - VertexHandle vl = to_vertex_handle(next_halfedge_handle(v0v1)); + //VertexHandle vl = to_vertex_handle(next_halfedge_handle(v0v1)); HalfedgeHandle h1 = next_halfedge_handle(v0v1); HalfedgeHandle h2 = next_halfedge_handle(h1); if (is_boundary(opposite_halfedge_handle(h1)) && is_boundary(opposite_halfedge_handle(h2))) - return false; + return false; } } @@ -373,12 +373,12 @@ bool PolyConnectivity::is_collapse_ok(HalfedgeHandle v0v1) { if (v1v0_triangle) { - VertexHandle vr = to_vertex_handle(next_halfedge_handle(v1v0)); + //VertexHandle vr = to_vertex_handle(next_halfedge_handle(v1v0)); HalfedgeHandle h1 = next_halfedge_handle(v1v0); HalfedgeHandle h2 = next_halfedge_handle(h1); if (is_boundary(opposite_halfedge_handle(h1)) && is_boundary(opposite_halfedge_handle(h2))) - return false; + return false; } } @@ -825,7 +825,7 @@ bool PolyConnectivity::is_simple_link(EdgeHandle _eh) const HalfedgeHandle heh0 = halfedge_handle(_eh, 0); HalfedgeHandle heh1 = halfedge_handle(_eh, 1); - FaceHandle fh0 = face_handle(heh0);//fh0 or fh1 might be a invalid, + //FaceHandle fh0 = face_handle(heh0);//fh0 or fh1 might be a invalid, FaceHandle fh1 = face_handle(heh1);//i.e., representing the boundary HalfedgeHandle next_heh = next_halfedge_handle(heh0); @@ -1145,9 +1145,9 @@ void PolyConnectivity::split_edge(EdgeHandle _eh, VertexHandle _vh) VertexHandle vfrom = from_vertex_handle(h0); HalfedgeHandle ph0 = prev_halfedge_handle(h0); - HalfedgeHandle ph1 = prev_halfedge_handle(h1); + //HalfedgeHandle ph1 = prev_halfedge_handle(h1); - HalfedgeHandle nh0 = next_halfedge_handle(h0); + //HalfedgeHandle nh0 = next_halfedge_handle(h0); HalfedgeHandle nh1 = next_halfedge_handle(h1); bool boundary0 = is_boundary(h0); diff --git a/src/OpenMesh/Tools/Decimater/ModHausdorffT.cc b/src/OpenMesh/Tools/Decimater/ModHausdorffT.cc index e0179586..2c281b92 100644 --- a/src/OpenMesh/Tools/Decimater/ModHausdorffT.cc +++ b/src/OpenMesh/Tools/Decimater/ModHausdorffT.cc @@ -129,7 +129,7 @@ distPointTriangleSquared( const Point& _p, s01 = ( v0v1 | v0p ) * inv_v0v1_2; if (s01 < 0.0) { - const Point n = v0v1 % v0v2; // not normalized ! + // const Point n = v0v1 % v0v2; // not normalized ! s02 = ( v0v2 | v0p ) * inv_v0v2_2; if (s02 <= 0.0) { v0p = _v0; diff --git a/src/Unittests/unittests_trimesh_circulator_face_face.cc b/src/Unittests/unittests_trimesh_circulator_face_face.cc index 2b7cb873..39daff95 100644 --- a/src/Unittests/unittests_trimesh_circulator_face_face.cc +++ b/src/Unittests/unittests_trimesh_circulator_face_face.cc @@ -236,7 +236,7 @@ TEST_F(OpenMeshTrimeshCirculatorFaceFace, FaceFaceIteratorHandleConversion) { face_vhandles.push_back(vhandle[0]); face_vhandles.push_back(vhandle[3]); face_vhandles.push_back(vhandle[2]); - Mesh::FaceHandle fh2 = mesh_.add_face(face_vhandles); + mesh_.add_face(face_vhandles); face_vhandles.clear(); diff --git a/src/Unittests/unittests_trimesh_circulator_vertex_face.cc b/src/Unittests/unittests_trimesh_circulator_vertex_face.cc index d1d3f45e..7339f9b6 100644 --- a/src/Unittests/unittests_trimesh_circulator_vertex_face.cc +++ b/src/Unittests/unittests_trimesh_circulator_vertex_face.cc @@ -158,7 +158,7 @@ TEST_F(OpenMeshTrimeshCirculatorVertexFace, VertexFaceIterWithoutHolesIncrement) |/ 1 \| 3 ==== 4 */ - Mesh::VertexFaceIter vfa_it = mesh_.vf_begin(vhandle[1]); + mesh_.vf_begin(vhandle[1]); // Iterate around vertex 1 at the middle (with holes in between) Mesh::VertexFaceIter vf_it = mesh_.vf_begin(vhandle[1]);