Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into smart_range_improvement

Browse Source
This commit is contained in:
Max Lyon
2019-11-28 13:42:39 +01:00
parent 9c806888c0 113f2879ad
commit 5149aba8cd
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CI/ci-cppcheck.sh
View File

@@ -32,7 +32,7 @@ echo "CPPCHECK Summary"
echo "==============================================================================" echo "=============================================================================="
echo -e "${NC}" echo -e "${NC}"
MAX_COUNT=27 MAX_COUNT=23
if [ $COUNT -gt $MAX_COUNT ]; then if [ $COUNT -gt $MAX_COUNT ]; then
echo -e ${WARNING} echo -e ${WARNING}

2
src/OpenMesh/Core/Mesh/ArrayKernel.hh
View File

@@ -766,7 +766,7 @@ public:
//! Complexity: O(1) //! Complexity: O(1)
inline void erase(iterator _it) inline void erase(iterator _it)
{ {
assert(_it != end() && is_in(*_it)); assert(_it != const_cast<const ExtStatusSetT*>(this)->end() && is_in(*_it));
Base::erase(*_it); Base::erase(*_it);
*_it = handles_.back(); *_it = handles_.back();
_it.pop_back(); _it.pop_back();

4
src/OpenMesh/Core/Mesh/CirculatorsT.hh
View File

@@ -315,8 +315,6 @@ class GenericCirculatorT : protected GenericCirculatorBaseT<typename GenericCirc
/// Standard dereferencing operator. /// Standard dereferencing operator.
smart_value_type operator*() const { smart_value_type operator*() const {
// We can't use this due to a GCC6 compiler bug
const GenericCirculatorBaseT<Mesh>* self = this;
#ifndef NDEBUG #ifndef NDEBUG
assert(this->heh_.is_valid()); assert(this->heh_.is_valid());
value_type res = GenericCirculatorT_TraitsT::toHandle(this->mesh_, this->heh_); value_type res = GenericCirculatorT_TraitsT::toHandle(this->mesh_, this->heh_);
@@ -504,8 +502,6 @@ class GenericCirculatorT_DEPRECATED : protected GenericCirculatorBaseT<typename
/// Standard dereferencing operator. /// Standard dereferencing operator.
smart_value_type operator*() const { smart_value_type operator*() const {
// We can't use this due to a GCC6 compiler bug
const GenericCirculatorBaseT<Mesh>* self = this;
#ifndef NDEBUG #ifndef NDEBUG
assert(this->heh_.is_valid()); assert(this->heh_.is_valid());
value_type res = (GenericCirculatorT_DEPRECATED_TraitsT::toHandle(this->mesh_, this->heh_)); value_type res = (GenericCirculatorT_DEPRECATED_TraitsT::toHandle(this->mesh_, this->heh_));

6
src/OpenMesh/Tools/Decimater/ModAspectRatioT_impl.hh
View File

@@ -133,16 +133,16 @@ template<class MeshT>
float ModAspectRatioT<MeshT>::collapse_priority(const CollapseInfo& _ci) { float ModAspectRatioT<MeshT>::collapse_priority(const CollapseInfo& _ci) {
typename Mesh::VertexHandle v2, v3; typename Mesh::VertexHandle v2, v3;
typename Mesh::FaceHandle fh; typename Mesh::FaceHandle fh;
const typename Mesh::Point *p1(&_ci.p1), *p2, *p3; const typename Mesh::Point* p1(&_ci.p1);
typename Mesh::Scalar r0, r1, r0_min(1.0), r1_min(1.0); typename Mesh::Scalar r0, r1, r0_min(1.0), r1_min(1.0);
typename Mesh::ConstVertexOHalfedgeIter voh_it(mesh_, _ci.v0); typename Mesh::ConstVertexOHalfedgeIter voh_it(mesh_, _ci.v0);
v3 = mesh_.to_vertex_handle(*voh_it); v3 = mesh_.to_vertex_handle(*voh_it);
p3 = &mesh_.point(v3); auto p3 = &mesh_.point(v3);
while (voh_it.is_valid()) { while (voh_it.is_valid()) {
v2 = v3; v2 = v3;
p2 = p3; auto p2 = p3;
++voh_it; ++voh_it;
v3 = mesh_.to_vertex_handle(*voh_it); v3 = mesh_.to_vertex_handle(*voh_it);