From c657f9a12542383ca505a175e9dc262e752e0bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20M=C3=B6ller?= Date: Tue, 11 Jun 2013 14:02:09 +0000 Subject: [PATCH] - fix some cpp check warnings and errors - fix "property_copy" which has no selfassign now git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@836 fdac6126-5c0c-442c-9429-916003d36597 --- .../Apps/Unsupported/Streaming/Client/QGLViewerWidget.cc | 2 +- src/OpenMesh/Core/Mesh/ArrayKernel.hh | 2 +- src/OpenMesh/Core/Mesh/BaseKernel.hh | 8 ++++---- src/OpenMesh/Core/Mesh/CirculatorsT.hh | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/OpenMesh/Apps/Unsupported/Streaming/Client/QGLViewerWidget.cc b/src/OpenMesh/Apps/Unsupported/Streaming/Client/QGLViewerWidget.cc index 0bbf0b6c..9149eb95 100644 --- a/src/OpenMesh/Apps/Unsupported/Streaming/Client/QGLViewerWidget.cc +++ b/src/OpenMesh/Apps/Unsupported/Streaming/Client/QGLViewerWidget.cc @@ -327,7 +327,7 @@ QGLViewerWidget::mouseMoveEvent( QMouseEvent* _event ) { if (last_point_ok_) { - if (newPoint_hitSphere = map_to_sphere(newPoint2D, newPoint3D)) + if ((newPoint_hitSphere = map_to_sphere(newPoint2D, newPoint3D))) { Vec3f axis = last_point_3D_ % newPoint3D; float cos_angle = (last_point_3D_ | newPoint3D); diff --git a/src/OpenMesh/Core/Mesh/ArrayKernel.hh b/src/OpenMesh/Core/Mesh/ArrayKernel.hh index ce9f5320..e832e766 100644 --- a/src/OpenMesh/Core/Mesh/ArrayKernel.hh +++ b/src/OpenMesh/Core/Mesh/ArrayKernel.hh @@ -719,7 +719,7 @@ public: assert(_it != end() && is_in(*_it)); clear(*_it); *_it = handles_.back(); - *_it.pop_back(); + _it.pop_back(); } inline void clear() diff --git a/src/OpenMesh/Core/Mesh/BaseKernel.hh b/src/OpenMesh/Core/Mesh/BaseKernel.hh index ef667497..b6f035ce 100644 --- a/src/OpenMesh/Core/Mesh/BaseKernel.hh +++ b/src/OpenMesh/Core/Mesh/BaseKernel.hh @@ -415,7 +415,7 @@ public: //------------------------------------------------ copy property template void copy_property(VPropHandleT& _ph, VertexHandle _vh_from, VertexHandle _vh_to) { if(_vh_from.is_valid() && _vh_to.is_valid()) - vprops_.property(_ph)[_vh_from.idx()] = vprops_.property(_ph)[_vh_from.idx()]; + vprops_.property(_ph)[_vh_to.idx()] = vprops_.property(_ph)[_vh_from.idx()]; } /** Copies a single property from one mesh element to another (of the same type) @@ -427,7 +427,7 @@ public: //------------------------------------------------ copy property template void copy_property(HPropHandleT _ph, HalfedgeHandle _hh_from, HalfedgeHandle _hh_to) { if(_hh_from.is_valid() && _hh_to.is_valid()) - hprops_.property(_ph)[_hh_from.idx()] = hprops_.property(_ph)[_hh_from.idx()]; + hprops_.property(_ph)[_hh_to.idx()] = hprops_.property(_ph)[_hh_from.idx()]; } /** Copies a single property from one mesh element to another (of the same type) @@ -439,7 +439,7 @@ public: //------------------------------------------------ copy property template void copy_property(EPropHandleT _ph, EdgeHandle _eh_from, EdgeHandle _eh_to) { if(_eh_from.is_valid() && _eh_to.is_valid()) - eprops_.property(_ph)[_eh_from.idx()] = eprops_.property(_ph)[_eh_from.idx()]; + eprops_.property(_ph)[_eh_to.idx()] = eprops_.property(_ph)[_eh_from.idx()]; } /** Copies a single property from one mesh element to another (of the same type) @@ -451,7 +451,7 @@ public: //------------------------------------------------ copy property template void copy_property(FPropHandleT _ph, FaceHandle _fh_from, FaceHandle _fh_to) { if(_fh_from.is_valid() && _fh_to.is_valid()) - fprops_.property(_ph)[_fh_from.idx()] = fprops_.property(_ph)[_fh_from.idx()]; + fprops_.property(_ph)[_fh_to.idx()] = fprops_.property(_ph)[_fh_from.idx()]; } diff --git a/src/OpenMesh/Core/Mesh/CirculatorsT.hh b/src/OpenMesh/Core/Mesh/CirculatorsT.hh index 65099561..cf6dc171 100644 --- a/src/OpenMesh/Core/Mesh/CirculatorsT.hh +++ b/src/OpenMesh/Core/Mesh/CirculatorsT.hh @@ -238,14 +238,14 @@ class VertexVertexIterT /// Return the handle of the current target. typename Mesh::VertexHandle handle() const { assert(mesh_); - return mesh_->to_vertex_handle(heh_);; + return mesh_->to_vertex_handle(heh_); } /// Cast to the handle of the current target. operator typename Mesh::VertexHandle() const { assert(mesh_); - return mesh_->to_vertex_handle(heh_);; + return mesh_->to_vertex_handle(heh_); } @@ -432,14 +432,14 @@ class ConstVertexVertexIterT /// Return the handle of the current target. typename Mesh::VertexHandle handle() const { assert(mesh_); - return mesh_->to_vertex_handle(heh_);; + return mesh_->to_vertex_handle(heh_); } /// Cast to the handle of the current target. operator typename Mesh::VertexHandle() const { assert(mesh_); - return mesh_->to_vertex_handle(heh_);; + return mesh_->to_vertex_handle(heh_); }