From f37ee2d46b70198e2cd316c144a752510d497c10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 21 Aug 2013 12:03:51 +0000 Subject: [PATCH] Fixed 2 more warnings git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@944 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh | 6 +----- src/OpenMesh/Core/IO/writer/OBJWriter.cc | 2 +- src/OpenMesh/Tools/Utils/StripifierT.cc | 6 ++++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh index 5e724f92..2a4eede5 100644 --- a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh +++ b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh @@ -141,11 +141,7 @@ public: // inherited { std::cout << "prepare decimater" << std::endl; - // to be compatible with gcc 2.95.3 - { - decimater_o tmp( new decimater_t ( mesh() ) ); - decimater_ = tmp; - } + decimater_ = decimater_o ( new decimater_t ( mesh() ) ); decimater_->add(mod_quadric_); decimater_->module(mod_quadric_).set_binary(false); diff --git a/src/OpenMesh/Core/IO/writer/OBJWriter.cc b/src/OpenMesh/Core/IO/writer/OBJWriter.cc index 1c7d79ea..5a008ee2 100644 --- a/src/OpenMesh/Core/IO/writer/OBJWriter.cc +++ b/src/OpenMesh/Core/IO/writer/OBJWriter.cc @@ -296,7 +296,7 @@ write(std::ostream& _out, BaseExporter& _be, Options _opt, std::streamsize _prec // if we are ina a new material block, specify in the file which material to use if(lastMat != material) { _out << "usemtl mat" << material << std::endl; - lastMat = material; + lastMat = material; } } diff --git a/src/OpenMesh/Tools/Utils/StripifierT.cc b/src/OpenMesh/Tools/Utils/StripifierT.cc index 49780de4..b17d3840 100644 --- a/src/OpenMesh/Tools/Utils/StripifierT.cc +++ b/src/OpenMesh/Tools/Utils/StripifierT.cc @@ -149,11 +149,13 @@ build_strips() // build 3 strips, take best one size_t best_length = 0; size_t best_idx = 0; - size_t length; + for (size_t i=0; i<3; ++i) { build_strip(h[i], experiments[i], faces[i]); - if ((length = experiments[i].size()) > best_length) + + const size_t length = experiments[i].size(); + if ( length > best_length) { best_length = length; best_idx = i;