From 9ca759fb5594f76885d7de871ab955b0232effaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 20 Aug 2013 14:55:38 +0000 Subject: [PATCH] Fixed various cppcheck warnings git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@934 fdac6126-5c0c-442c-9429-916003d36597 --- Doc/Tutorial/09-persistence/fill_props.hh | 22 ++-- src/OpenMesh/Tools/Decimater/ModQuadricT.cc | 11 +- .../Uniform/Composite/CompositeT.cc | 118 +++++++----------- 3 files changed, 58 insertions(+), 93 deletions(-) diff --git a/Doc/Tutorial/09-persistence/fill_props.hh b/Doc/Tutorial/09-persistence/fill_props.hh index da34e30a..5f2b4f45 100644 --- a/Doc/Tutorial/09-persistence/fill_props.hh +++ b/Doc/Tutorial/09-persistence/fill_props.hh @@ -9,13 +9,12 @@ template bool fill_props( Mesh& _m, OpenMesh::VPropHandleT _ph, bool _check=false) { - float v; static float a[9] = { 1.1f, 2.2f, 3.3f, 4.4f, 5.5f, 6.6f, 7.7f, 8.8f, 9.9f }; for(typename Mesh::VertexIter it=_m.vertices_begin(); it != _m.vertices_end(); ++it) { - v = a[it->idx()%9]; + const float v = a[it->idx()%9]; if ( _check && !(_m.property( _ph, it ) == v) ) return false; else @@ -29,13 +28,12 @@ template bool fill_props( Mesh& _m, OpenMesh::EPropHandleT _ph, bool _check=false ) { - size_t n; - bool v; + for( typename Mesh::EdgeIter it=_m.edges_begin(); it != _m.edges_end(); ++it) { - n = it->idx(); - v = ((n&(n-1))==0); // true for 0,1,2,4,8,.. + const size_t n = it->idx(); + const bool v = ((n&(n-1))==0); // true for 0,1,2,4,8,.. if (_check && _m.property( _ph, it ) != v) { @@ -58,12 +56,12 @@ template bool fill_props(Mesh& _m, OpenMesh::FPropHandleT _ph, bool _check=false) { - int n; + for( typename Mesh::FaceIter it=_m.faces_begin(); it != _m.faces_end(); ++it) { - n = it->idx(); - _m.property( _ph, it ) = int2roman(++n); + const int n = ++(it->idx()); + _m.property( _ph, it ) = int2roman(n); } return true; } @@ -73,7 +71,6 @@ template bool fill_props( Mesh& _m, OpenMesh::HPropHandleT _ph, bool _check=false) { - int n; T v; static float a[9] = { 1.1f, 2.2f, 3.3f, 4.4f, 5.5f, 6.6f, 7.7f, 8.8f, 9.9f }; static float b[9] = { 2.2f, 3.3f, 4.4f, 5.5f, 6.6f, 7.7f, 8.8f, 9.9f, 1.1f }; @@ -85,7 +82,7 @@ fill_props( Mesh& _m, OpenMesh::HPropHandleT _ph, bool _check=false) for( typename Mesh::HalfedgeIter it=_m.halfedges_begin(); it != _m.halfedges_end(); ++it) { - n = it->idx(); + const int n = it->idx(); v = it->idx()+1; // ival v = values[n%9]; // dval @@ -107,10 +104,9 @@ template bool fill_props( Mesh& _m, OpenMesh::MPropHandleT _ph, bool _check=false) { - size_t idx; for( typename Mesh::FaceIter it=_m.faces_begin(); it != _m.faces_end(); ++it) { - idx = it->idx(); + const size_t idx = it->idx(); if ( _check && _m.property( _ph )[int2roman(idx+1)] != idx ) return false; else diff --git a/src/OpenMesh/Tools/Decimater/ModQuadricT.cc b/src/OpenMesh/Tools/Decimater/ModQuadricT.cc index 19af9fa8..2d214d44 100644 --- a/src/OpenMesh/Tools/Decimater/ModQuadricT.cc +++ b/src/OpenMesh/Tools/Decimater/ModQuadricT.cc @@ -89,7 +89,6 @@ initialize() typename Mesh::FaceVertexIter fv_it; typename Mesh::VertexHandle vh0, vh1, vh2; typedef Vec3d Vec3; - double a,b,c,d, area; for (; f_it != f_end; ++f_it) { @@ -108,17 +107,17 @@ initialize() } Vec3 n = (v1-v0) % (v2-v0); - area = n.norm(); + double area = n.norm(); if (area > FLT_MIN) { n /= area; area *= 0.5; } - a = n[0]; - b = n[1]; - c = n[2]; - d = -(vector_cast(Base::mesh().point(vh0))|n); + const double a = n[0]; + const double b = n[1]; + const double c = n[2]; + const double d = -(vector_cast(Base::mesh().point(vh0))|n); Quadricd q(a, b, c, d); q *= area; diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc index 274675a2..3da35fdc 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc +++ b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc @@ -286,15 +286,13 @@ void CompositeT::VF() { assert(p_mesh_); MeshType& mesh_ = *p_mesh_; - unsigned int valence; - typename MeshType::Point cog, - zero_point(0.0, 0.0, 0.0); + typename MeshType::Point cog,zero_point(0.0, 0.0, 0.0); typename MeshType::FaceVertexIter fv_it; typename MeshType::FaceIter f_it; for (f_it = mesh_.faces_begin(); f_it != mesh_.faces_end(); ++f_it) { - valence = 0; + unsigned int valence = 0; cog = zero_point; for (fv_it = mesh_.fv_iter(*f_it); fv_it.is_valid(); ++fv_it) { @@ -313,8 +311,7 @@ void CompositeT::VFa(Coeff& _coeff) assert(p_mesh_); MeshType& mesh_ = *p_mesh_; unsigned int valence[3], i; - typename MeshType::Point cog, - zero_point(0.0, 0.0, 0.0); + typename MeshType::Point cog,zero_point(0.0, 0.0, 0.0); typename MeshType::Scalar alpha; typename MeshType::FaceIter f_it; typename MeshType::HalfedgeHandle heh; @@ -331,7 +328,7 @@ void CompositeT::VFa(Coeff& _coeff) vh[i] = mesh_.to_vertex_handle(heh); for (voh_it = mesh_.voh_iter(vh[i]); voh_it; ++voh_it) { - ++valence[i]; + ++valence[i]; } heh = mesh_.next_halfedge_handle(heh); @@ -339,14 +336,14 @@ void CompositeT::VFa(Coeff& _coeff) if (valence[0] <= valence[1]) if (valence[0] <= valence[2]) - i = 0; + i = 0; else - i = 2; + i = 2; else if (valence[1] <= valence[2]) - i = 1; + i = 1; else - i = 2; + i = 2; alpha = _coeff(valence[i]); @@ -425,7 +422,6 @@ void CompositeT::FF() { assert(p_mesh_); MeshType& mesh_ = *p_mesh_; - unsigned int valence; typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); typename MeshType::FaceFaceIter ff_it; @@ -436,7 +432,7 @@ void CompositeT::FF() for (f_it = mesh_.faces_begin(); f_it != mesh_.faces_end(); ++f_it) { - valence = 0; + unsigned int valence = 0; cog = zero_point; for (ff_it = mesh_.ff_iter(*f_it); ff_it.is_valid(); ++ff_it) @@ -462,7 +458,6 @@ void CompositeT::FFc(Coeff& _coeff) { assert(p_mesh_); MeshType& mesh_ = *p_mesh_; - unsigned int valence; typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); typename MeshType::FaceFaceIter ff_it; @@ -472,7 +467,7 @@ void CompositeT::FFc(Coeff& _coeff) for (f_it = mesh_.faces_begin(); f_it != mesh_.faces_end(); ++f_it) { - valence = 0; + unsigned int valence = 0; cog = zero_point; for (ff_it = mesh_.ff_iter(*f_it); ff_it; ++ff_it) { @@ -503,16 +498,14 @@ void CompositeT::FFc(scalar_t _c) { assert(p_mesh_); MeshType& mesh_ = *p_mesh_; - unsigned int valence; - typename MeshType::Point cog, - zero_point(0.0, 0.0, 0.0); + typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); typename MeshType::FaceFaceIter ff_it; typename MeshType::FaceIter f_it; std::vector point_vector; for (f_it = mesh_.faces_begin(); f_it != mesh_.faces_end(); ++f_it) { - valence = 0; + unsigned int valence = 0; cog = zero_point; for (ff_it = mesh_.ff_iter(*f_it); ff_it; ++ff_it) { @@ -540,7 +533,6 @@ void CompositeT::FV() { assert(p_mesh_); MeshType& mesh_ = *p_mesh_; - unsigned int valence; typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); typename MeshType::VertexFaceIter vf_it; @@ -548,7 +540,7 @@ void CompositeT::FV() for (v_it = mesh_.vertices_begin(); v_it != mesh_.vertices_end(); ++v_it) { - valence = 0; + unsigned int valence = 0; cog = zero_point; for (vf_it = mesh_.vf_iter(*v_it); vf_it; ++vf_it) { @@ -566,7 +558,7 @@ void CompositeT::FVc(Coeff& _coeff) { assert(p_mesh_); MeshType& mesh_ = *p_mesh_; - unsigned int valence; + typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); scalar_t c; @@ -575,7 +567,7 @@ void CompositeT::FVc(Coeff& _coeff) for (v_it = mesh_.vertices_begin(); v_it != mesh_.vertices_end(); ++v_it) { - valence = 0; + unsigned int valence = 0; cog = zero_point; for (voh_it = mesh_.voh_iter(*v_it); voh_it.is_valid(); ++voh_it) { @@ -588,14 +580,14 @@ void CompositeT::FVc(Coeff& _coeff) if (mesh_.face_handle(*voh_it).is_valid()) { - if (mesh_.face_handle(mesh_.opposite_halfedge_handle(mesh_.next_halfedge_handle(*voh_it))).is_valid()) { - cog += mesh_.data(mesh_.face_handle(*voh_it)).position() * c; - cog += mesh_.data(mesh_.face_handle(mesh_.opposite_halfedge_handle(mesh_.next_halfedge_handle(*voh_it)))).position() * (1.0 - c); - } else { - cog += mesh_.data(mesh_.face_handle(*voh_it)).position(); - } + if (mesh_.face_handle(mesh_.opposite_halfedge_handle(mesh_.next_halfedge_handle(*voh_it))).is_valid()) { + cog += mesh_.data(mesh_.face_handle(*voh_it)).position() * c; + cog += mesh_.data(mesh_.face_handle(mesh_.opposite_halfedge_handle(mesh_.next_halfedge_handle(*voh_it)))).position() * (1.0 - c); + } else { + cog += mesh_.data(mesh_.face_handle(*voh_it)).position(); + } } else { - --valence; + --valence; } } @@ -612,15 +604,13 @@ void CompositeT::FVc(scalar_t _c) { assert(p_mesh_); MeshType& mesh_ = *p_mesh_; - unsigned int valence; - typename MeshType::Point cog, - zero_point(0.0, 0.0, 0.0); + typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); typename MeshType::VertexOHalfedgeIter voh_it; typename MeshType::VertexIter v_it; for (v_it = mesh_.vertices_begin(); v_it != mesh_.vertices_end(); ++v_it) { - valence = 0; + unsigned int valence = 0; cog = zero_point; for (voh_it = mesh_.voh_iter(*v_it); voh_it; ++voh_it) { @@ -656,15 +646,13 @@ void CompositeT::VdE() assert(p_mesh_); MeshType& mesh_ = *p_mesh_; typename MeshType::EdgeIter e_it; - typename MeshType::Point cog, - zero_point(0.0, 0.0, 0.0); + typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); typename MeshType::HalfedgeHandle heh1, heh2; - unsigned int valence; for (e_it = mesh_.edges_begin(); e_it != mesh_.edges_end(); ++e_it) { cog = zero_point; - valence = 2; + unsigned int valence = 2; heh1 = mesh_.halfedge_handle(*e_it, 0); heh2 = mesh_.opposite_halfedge_handle(heh1); @@ -694,8 +682,7 @@ void CompositeT::VdEc(scalar_t _c) assert(p_mesh_); MeshType& mesh_ = *p_mesh_; typename MeshType::EdgeIter e_it; - typename MeshType::Point cog, - zero_point(0.0, 0.0, 0.0); + typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); typename MeshType::HalfedgeHandle heh; for (e_it = mesh_.edges_begin(); e_it != mesh_.edges_end(); ++e_it) { @@ -727,8 +714,7 @@ void CompositeT::VdEg(scalar_t _gamma) assert(p_mesh_); MeshType& mesh_ = *p_mesh_; typename MeshType::EdgeIter e_it; - typename MeshType::Point cog, - zero_point(0.0, 0.0, 0.0); + typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); typename MeshType::HalfedgeHandle heh; typename MeshType::VertexOHalfedgeIter voh_it; unsigned int valence[2], i; @@ -787,8 +773,7 @@ void CompositeT::VdEg(Coeff& _coeff) assert(p_mesh_); MeshType& mesh_ = *p_mesh_; typename MeshType::EdgeIter e_it; - typename MeshType::Point cog, - zero_point(0.0, 0.0, 0.0); + typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); typename MeshType::HalfedgeHandle heh; typename MeshType::VertexOHalfedgeIter voh_it; unsigned int valence[2], i; @@ -850,14 +835,12 @@ void CompositeT::EV() assert(p_mesh_); MeshType& mesh_ = *p_mesh_; typename MeshType::VertexIter v_it; - typename MeshType::Point cog, - zero_point(0.0, 0.0, 0.0); - unsigned int valence; + typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); typename MeshType::VertexEdgeIter ve_it; for (v_it = mesh_.vertices_begin(); v_it != mesh_.vertices_end(); ++v_it) { - valence = 0; + unsigned int valence = 0; cog = zero_point; for (ve_it = mesh_.ve_iter(*v_it); ve_it; ++ve_it) { @@ -878,15 +861,13 @@ void CompositeT::EVc(Coeff& _coeff) assert(p_mesh_); MeshType& mesh_ = *p_mesh_; typename MeshType::VertexIter v_it; - typename MeshType::Point cog, - zero_point(0.0, 0.0, 0.0); - unsigned int valence; + typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); typename MeshType::VertexOHalfedgeIter voh_it; scalar_t c; for (v_it = mesh_.vertices_begin(); v_it != mesh_.vertices_end(); ++v_it) { - valence = 0; + unsigned int valence = 0; cog = zero_point; for (voh_it = mesh_.voh_iter(*v_it); voh_it.is_valid(); ++voh_it) @@ -913,13 +894,11 @@ void CompositeT::EVc(scalar_t _c) { assert(p_mesh_); MeshType& mesh_ = *p_mesh_; typename MeshType::VertexIter v_it; - typename MeshType::Point cog, - zero_point(0.0, 0.0, 0.0); - unsigned int valence; + typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); typename MeshType::VertexOHalfedgeIter voh_it; for (v_it = mesh_.vertices_begin(); v_it != mesh_.vertices_end(); ++v_it) { - valence = 0; + unsigned int valence = 0; cog = zero_point; for (voh_it = mesh_.voh_iter(*v_it); voh_it; ++voh_it) { @@ -945,12 +924,10 @@ void CompositeT::EF() typename MeshType::FaceIter f_it; typename MeshType::FaceEdgeIter fe_it; - unsigned int valence; - typename MeshType::Point cog, - zero_point(0.0, 0.0, 0.0); + typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); for (f_it = mesh_.faces_begin(); f_it != mesh_.faces_end(); ++f_it) { - valence = 0; + unsigned int valence = 0; cog = zero_point; for (fe_it = mesh_.fe_iter(*f_it); fe_it; ++fe_it) { @@ -970,12 +947,10 @@ void CompositeT::FE() assert(p_mesh_); MeshType& mesh_ = *p_mesh_; typename MeshType::EdgeIter e_it; - unsigned int valence; - typename MeshType::Point cog, - zero_point(0.0, 0.0, 0.0); + typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); for (e_it = mesh_.edges_begin(); e_it != mesh_.edges_end(); ++e_it) { - valence = 0; + unsigned int valence = 0; cog = zero_point; if (mesh_.face_handle(mesh_.halfedge_handle(*e_it, 0)).is_valid()) { @@ -1053,7 +1028,6 @@ void CompositeT::VVc(Coeff& _coeff) { assert(p_mesh_); MeshType& mesh_ = *p_mesh_; - unsigned int valence; typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); typename MeshType::VertexVertexIter vv_it; @@ -1063,7 +1037,7 @@ void CompositeT::VVc(Coeff& _coeff) for (v_it = mesh_.vertices_begin(); v_it != mesh_.vertices_end(); ++v_it) { - valence = 0; + unsigned int valence = 0; cog = zero_point; for (vv_it = mesh_.vv_iter(*v_it); vv_it; ++vv_it) @@ -1090,16 +1064,14 @@ void CompositeT::VVc(scalar_t _c) { assert(p_mesh_); MeshType& mesh_ = *p_mesh_; - unsigned int valence; - typename MeshType::Point cog, - zero_point(0.0, 0.0, 0.0); + typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); typename MeshType::VertexVertexIter vv_it; typename MeshType::VertexIter v_it; std::vector point_vector; for (v_it = mesh_.vertices_begin(); v_it != mesh_.vertices_end(); ++v_it) { - valence = 0; + unsigned int valence = 0; cog = zero_point; for (vv_it = mesh_.vv_iter(*v_it); vv_it; ++vv_it) { @@ -1128,9 +1100,7 @@ void CompositeT::EdE() { assert(p_mesh_); MeshType& mesh_ = *p_mesh_; - unsigned int valence; - typename MeshType::Point cog, - zero_point(0.0, 0.0, 0.0); + typename MeshType::Point cog, zero_point(0.0, 0.0, 0.0); typename MeshType::EdgeIter e_it; typename MeshType::HalfedgeHandle heh; std::vector point_vector; @@ -1139,7 +1109,7 @@ void CompositeT::EdE() for (e_it = mesh_.edges_begin(); e_it != mesh_.edges_end(); ++e_it) { - valence = 0; + unsigned int valence = 0; cog = zero_point; for (int i = 0; i <= 1; ++i) {