From dfc4cb0915f6b28ac43060e52c93ae6413d7537b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 4 Oct 2011 06:47:01 +0000 Subject: [PATCH] Removed compiler warning in Decimater widget where behaviour could be undefined git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@414 fdac6126-5c0c-442c-9429-916003d36597 --- .../Apps/Decimating/DecimaterViewerWidget.cc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.cc b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.cc index d9935393..bbf129f9 100644 --- a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.cc +++ b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.cc @@ -72,23 +72,25 @@ void DecimaterViewerWidget::keyPressEvent(QKeyEvent* _event) int rc; if ( (rc=decimater_->decimate(steps_)) ) { - decimater_->mesh().garbage_collection(); - std::cout << rc << " vertices removed!\n"; - updateGL(); + decimater_->mesh().garbage_collection(); + std::cout << rc << " vertices removed!\n"; + updateGL(); } else - std::cout << "Decimation failed\n"; + std::cout << "Decimation failed\n"; break; } case Key_Plus: - steps_ = std::min( ++steps_, (size_t)(mesh_.n_vertices() * 0.1) ); + ++steps_; + steps_ = std::min( steps_ , (size_t)( mesh_.n_vertices() / 10 ) ); updateGL(); std::cout << "# decimating steps increased to " << steps_ << std::endl; break; case Key_Minus: - steps_ = std::max( --steps_, size_t(1) ); + --steps_; + steps_ = std::max( steps_ , size_t(1) ); updateGL(); std::cout << "# decimating steps increased to " << steps_ << std::endl; break; @@ -100,7 +102,7 @@ void DecimaterViewerWidget::keyPressEvent(QKeyEvent* _event) opt += OpenMesh::IO::Options::Binary; if (OpenMesh::IO::write_mesh( mesh(), "result.off", opt )) - std::cout << "mesh saved in 'result.off'\n"; + std::cout << "mesh saved in 'result.off'\n"; } break;