From 7c1a8012d5d1fad5ff3f5e185e5cb307a563efc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 29 May 2019 10:55:52 +0200 Subject: [PATCH] Fixed more clang warnings --- CI/ci-cppcheck.sh | 2 +- src/OpenMesh/Core/Utils/Property.hh | 4 ++-- src/OpenMesh/Tools/Decimater/ModHausdorffT.hh | 2 +- .../Tools/Decimater/ModIndependentSetsT.hh | 2 +- .../Tools/Decimater/ModNormalDeviationT.hh | 2 +- src/OpenMesh/Tools/Decimater/ModProgMeshT.hh | 2 +- src/OpenMesh/Tools/Decimater/ModQuadricT.hh | 2 +- .../Subdivider/Adaptive/Composite/RulesT.hh | 18 +++++++++--------- .../Subdivider/Uniform/CatmullClarkT_impl.hh | 1 - .../Subdivider/Uniform/Composite/CompositeT.hh | 2 +- ...rt3InterpolatingSubdividerLabsikGreinerT.hh | 2 +- 11 files changed, 19 insertions(+), 20 deletions(-) diff --git a/CI/ci-cppcheck.sh b/CI/ci-cppcheck.sh index 520ed1be..914376c2 100755 --- a/CI/ci-cppcheck.sh +++ b/CI/ci-cppcheck.sh @@ -30,7 +30,7 @@ echo "CPPCHECK Summary" echo "==============================================================================" echo -e "${NC}" -MAX_COUNT=27 +MAX_COUNT=26 if [ $COUNT -gt $MAX_COUNT ]; then echo -e ${WARNING} diff --git a/src/OpenMesh/Core/Utils/Property.hh b/src/OpenMesh/Core/Utils/Property.hh index b0b45b77..629225c6 100644 --- a/src/OpenMesh/Core/Utils/Property.hh +++ b/src/OpenMesh/Core/Utils/Property.hh @@ -363,7 +363,7 @@ public: } /// Make a copy of self. - PropertyT* clone() const + PropertyT* clone() const override { PropertyT* p = new PropertyT( *this ); return p; @@ -451,7 +451,7 @@ public: return ((value_type*) &data_[0])[_idx]; } - PropertyT* clone() const { + PropertyT* clone() const override { PropertyT* p = new PropertyT( *this ); return p; } diff --git a/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh b/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh index 7d7d040b..736f80d6 100644 --- a/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh +++ b/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh @@ -123,7 +123,7 @@ class ModHausdorffT: public ModBaseT { virtual float collapse_priority(const CollapseInfo& _ci); /// re-distribute points - virtual void postprocess_collapse(const CollapseInfo& _ci); + virtual void postprocess_collapse(const CollapseInfo& _ci) override; /// set the percentage of tolerance void set_error_tolerance_factor(double _factor); diff --git a/src/OpenMesh/Tools/Decimater/ModIndependentSetsT.hh b/src/OpenMesh/Tools/Decimater/ModIndependentSetsT.hh index c7c4895c..7a416af7 100644 --- a/src/OpenMesh/Tools/Decimater/ModIndependentSetsT.hh +++ b/src/OpenMesh/Tools/Decimater/ModIndependentSetsT.hh @@ -77,7 +77,7 @@ class ModIndependentSetsT: public ModBaseT { } /// override - void postprocess_collapse(const CollapseInfo& _ci) { + void postprocess_collapse(const CollapseInfo& _ci) override { typename Mesh::VertexVertexIter vv_it; Base::mesh().status(_ci.v1).set_locked(true); diff --git a/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh b/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh index 1c11a93c..ed693dae 100644 --- a/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh +++ b/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh @@ -216,7 +216,7 @@ public: } - void postprocess_collapse(const CollapseInfo& _ci) { + void postprocess_collapse(const CollapseInfo& _ci) override { // account for changed normals typename Mesh::VertexFaceIter vf_it(mesh_, _ci.v1); for (; vf_it.is_valid(); ++vf_it) diff --git a/src/OpenMesh/Tools/Decimater/ModProgMeshT.hh b/src/OpenMesh/Tools/Decimater/ModProgMeshT.hh index 43c02982..dbedc07c 100644 --- a/src/OpenMesh/Tools/Decimater/ModProgMeshT.hh +++ b/src/OpenMesh/Tools/Decimater/ModProgMeshT.hh @@ -130,7 +130,7 @@ public: // inherited /// Stores collapse information in a queue. /// \see infolist() - void postprocess_collapse(const CollapseInfo& _ci) + void postprocess_collapse(const CollapseInfo& _ci) override { pmi_.push_back( Info( _ci ) ); } diff --git a/src/OpenMesh/Tools/Decimater/ModQuadricT.hh b/src/OpenMesh/Tools/Decimater/ModQuadricT.hh index 444c1098..6dc12b45 100644 --- a/src/OpenMesh/Tools/Decimater/ModQuadricT.hh +++ b/src/OpenMesh/Tools/Decimater/ModQuadricT.hh @@ -131,7 +131,7 @@ public: // inherited /// Post-process halfedge collapse (accumulate quadrics) - virtual void postprocess_collapse(const CollapseInfo& _ci) + virtual void postprocess_collapse(const CollapseInfo& _ci) override { Base::mesh().property(quadrics_, _ci.v1) += Base::mesh().property(quadrics_, _ci.v0); diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh index 576193de..71926139 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh @@ -101,8 +101,8 @@ public: explicit Tvv3(M& _mesh) : Inherited(_mesh) { Base::set_subdiv_type(3); }; - void raise(typename M::FaceHandle& _fh, state_t _target_state); - void raise(typename M::VertexHandle& _vh, state_t _target_state); + void raise(typename M::FaceHandle& _fh, state_t _target_state) override; + void raise(typename M::VertexHandle& _vh, state_t _target_state) override; MIPS_WARN_WA(Edge) // avoid warning }; @@ -126,9 +126,9 @@ public: explicit Tvv4(M& _mesh) : Inherited(_mesh) { Base::set_subdiv_type(4); }; - void raise(typename M::FaceHandle& _fh, state_t _target_state); - void raise(typename M::VertexHandle& _vh, state_t _target_state); - void raise(typename M::EdgeHandle& _eh, state_t _target_state); + void raise(typename M::FaceHandle& _fh, state_t _target_state) override; + void raise(typename M::VertexHandle& _vh, state_t _target_state) override; + void raise(typename M::EdgeHandle& _eh, state_t _target_state) override; private: @@ -154,7 +154,7 @@ public: explicit VF(M& _mesh) : Inherited(_mesh) {} - void raise(typename M::FaceHandle& _fh, state_t _target_state); + void raise(typename M::FaceHandle& _fh, state_t _target_state) override; MIPS_WARN_WA(Edge) MIPS_WARN_WA(Vertex) }; @@ -176,7 +176,7 @@ public: explicit FF(M& _mesh) : Inherited(_mesh) {} - void raise(typename M::FaceHandle& _fh, state_t _target_state); + void raise(typename M::FaceHandle& _fh, state_t _target_state) override; MIPS_WARN_WA(Vertex) // avoid warning MIPS_WARN_WA(Edge ) // avoid warning }; @@ -198,7 +198,7 @@ public: explicit FFc(M& _mesh) : Inherited(_mesh) {} - void raise(typename M::FaceHandle& _fh, state_t _target_state); + void raise(typename M::FaceHandle& _fh, state_t _target_state) override; MIPS_WARN_WA(Vertex) // avoid warning MIPS_WARN_WA(Edge ) // avoid warning }; @@ -220,7 +220,7 @@ public: explicit FV(M& _mesh) : Inherited(_mesh) {} - void raise(typename M::VertexHandle& _vh, state_t _target_state); + void raise(typename M::VertexHandle& _vh, state_t _target_state) override; MIPS_WARN_WA(Face) // avoid warning MIPS_WARN_WA(Edge) // avoid warning }; diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT_impl.hh b/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT_impl.hh index a117618f..40978930 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT_impl.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT_impl.hh @@ -333,7 +333,6 @@ CatmullClarkT::update_vertex( MeshType& _m, const VertexHandl // and http://www.cs.utah.edu/~lacewell/subdeval if ( _m.is_boundary( _vh)) { - Normal Vec; pos = _m.point(_vh); VertexEdgeIter ve_itr; for ( ve_itr = _m.ve_iter( _vh); ve_itr.is_valid(); ++ve_itr) diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh index f923e35c..6a9b2fb0 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh @@ -122,7 +122,7 @@ protected: // inherited interface } #ifdef NDEBUG - bool cleanup( MeshType& ) + bool cleanup( MeshType& ) override #else bool cleanup( MeshType& _m ) override #endif diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh index 6330797e..d3b7199c 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh @@ -409,7 +409,7 @@ private: typename MeshType::HalfedgeHandle heh; typename MeshType::VertexHandle vh1, vh2, vh3, vh4, vhl, vhr; - typename MeshType::Point zero(0,0,0), P1, P2, P3, P4; + typename MeshType::Point P1, P2, P3, P4; /* // *---------*---------*