From 7c4273dd787fdad4bdc8e71f44b455092dd56a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 12 Jan 2012 09:15:18 +0000 Subject: [PATCH] Fixed cppcheck warnings git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@485 fdac6126-5c0c-442c-9429-916003d36597 --- .../Apps/Decimating/DecimaterViewerWidget.cc | 1 + src/OpenMesh/Core/IO/reader/OBJReader.cc | 2 +- src/OpenMesh/Core/IO/reader/OMReader.cc | 4 +--- src/OpenMesh/Core/IO/writer/OMWriter.cc | 16 ---------------- src/OpenMesh/Tools/Utils/Timer.cc | 2 +- 5 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.cc b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.cc index bbf129f9..71e7ccdc 100644 --- a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.cc +++ b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.cc @@ -112,6 +112,7 @@ void DecimaterViewerWidget::keyPressEvent(QKeyEvent* _event) default: this->inherited_t::keyPressEvent(_event); + break; } } diff --git a/src/OpenMesh/Core/IO/reader/OBJReader.cc b/src/OpenMesh/Core/IO/reader/OBJReader.cc index 85a6f681..9ef6ce56 100644 --- a/src/OpenMesh/Core/IO/reader/OBJReader.cc +++ b/src/OpenMesh/Core/IO/reader/OBJReader.cc @@ -330,7 +330,7 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt) omlog() << " " << materials_.size() << " materials loaded.\n"; - for ( MaterialList::iterator material = materials_.begin(); material != materials_.end(); material++ ) + for ( MaterialList::iterator material = materials_.begin(); material != materials_.end(); ++material ) { // Save the texture information in a property if ( (*material).second.has_map_Kd() ) diff --git a/src/OpenMesh/Core/IO/reader/OMReader.cc b/src/OpenMesh/Core/IO/reader/OMReader.cc index 20b9f606..fc8e2837 100644 --- a/src/OpenMesh/Core/IO/reader/OMReader.cc +++ b/src/OpenMesh/Core/IO/reader/OMReader.cc @@ -614,9 +614,6 @@ _OMReader_::restore_binary_custom_data( std::istream& _is, BaseProperty* _bp, if ( _bp ) { -#if defined(OM_DEBUG) - size_t b; -#endif size_t n_bytes = _bp->size_of( _n_elem ); if ( ((n_bytes == BaseProperty::UnknownSize) || (n_bytes == block_size)) && @@ -624,6 +621,7 @@ _OMReader_::restore_binary_custom_data( std::istream& _is, BaseProperty* _bp, (_n_elem * _bp->element_size() == block_size) ) ) { #if defined(OM_DEBUG) + size_t b; bytes += (b=_bp->restore( _is, _swap )); #else bytes += _bp->restore( _is, _swap ); diff --git a/src/OpenMesh/Core/IO/writer/OMWriter.cc b/src/OpenMesh/Core/IO/writer/OMWriter.cc index 54b1a1a3..146cff89 100644 --- a/src/OpenMesh/Core/IO/writer/OMWriter.cc +++ b/src/OpenMesh/Core/IO/writer/OMWriter.cc @@ -145,29 +145,13 @@ _OMWriter_::write(std::ostream& _os, BaseExporter& _be, Options _opt) const _opt += Options::LSB; _opt -= Options::MSB; -// if ( _opt.check(Options::Binary) ) -// { return write_binary(_os, _be, _opt); -// } -// else -// { -// return write_ascii(_os, _be, _opt); -// } } //----------------------------------------------------------------------------- -// bool _OMWriter_::write_ascii(std::ostream& _os, BaseExporter& _be, -// Options _opt) const -// { -// return false; -// } - -//----------------------------------------------------------------------------- - - #ifndef DOXY_IGNORE_THIS template struct Enabler { diff --git a/src/OpenMesh/Tools/Utils/Timer.cc b/src/OpenMesh/Tools/Utils/Timer.cc index d8c60e16..518c5090 100644 --- a/src/OpenMesh/Tools/Utils/Timer.cc +++ b/src/OpenMesh/Tools/Utils/Timer.cc @@ -229,7 +229,7 @@ static const unsigned long clockticks = CLOCKS_PER_SEC; class TimerImplStd : public TimerImpl { public: - TimerImplStd() : freq_(clockticks) { reset(); } + TimerImplStd() : freq_(clockticks),count_(0),start_(0) { reset(); } ~TimerImplStd() { ; } virtual void reset(void) { count_ = 0; }