From 04cd7f498104ad54435595136047b524e777f393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 9 May 2016 12:41:36 +0200 Subject: [PATCH 1/3] Fixed uninitialized members in color translators (cppcheck-fixes) --- ACG/GL/ColorTranslator.hh | 8 +++++++- ACG/QtWidgets/QtColorTranslator.hh | 8 ++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ACG/GL/ColorTranslator.hh b/ACG/GL/ColorTranslator.hh index 6e5ecfef3..d68cbb32a 100644 --- a/ACG/GL/ColorTranslator.hh +++ b/ACG/GL/ColorTranslator.hh @@ -84,7 +84,13 @@ class ACGDLLEXPORT ColorTranslator public: /// Default constructor. - ColorTranslator() : initialized_(false) {}; + ColorTranslator() : initialized_(false), + red_bits_(0), green_bits_(0), blue_bits_(0), alpha_bits_(0), + red_mask_(0), green_mask_(0), blue_mask_(0), alpha_mask_(0), + red_shift_(0), green_shift_(0), blue_shift_(0), alpha_shift_(0), + red_round_(0), green_round_(0), blue_round_(0), alpha_round_(0) + {}; + /// Destructor. ~ColorTranslator() {}; diff --git a/ACG/QtWidgets/QtColorTranslator.hh b/ACG/QtWidgets/QtColorTranslator.hh index 131f309cb..c2c31ad16 100644 --- a/ACG/QtWidgets/QtColorTranslator.hh +++ b/ACG/QtWidgets/QtColorTranslator.hh @@ -88,8 +88,12 @@ class ACGDLLEXPORT QtColorTranslator public: /// Default constructor. - QtColorTranslator() - : initialized_(false) {}; + QtColorTranslator() : initialized_(false), + red_bits_(0), green_bits_(0), blue_bits_(0), + red_mask_(0), green_mask_(0), blue_mask_(0), + red_shift_(0), green_shift_(0), blue_shift_(0), + red_round_(0), green_round_(0), blue_round_(0) + {}; /// construct with QGLcontext QtColorTranslator(QGLContext& _context) -- GitLab From 36cbe6134a82f41568ff6e50309ffda6e86fd385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 9 May 2016 12:43:32 +0200 Subject: [PATCH 2/3] CP Typo --- ACG/QtWidgets/QtColorTranslator.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ACG/QtWidgets/QtColorTranslator.hh b/ACG/QtWidgets/QtColorTranslator.hh index c2c31ad16..f92b0910a 100644 --- a/ACG/QtWidgets/QtColorTranslator.hh +++ b/ACG/QtWidgets/QtColorTranslator.hh @@ -89,10 +89,10 @@ public: /// Default constructor. QtColorTranslator() : initialized_(false), - red_bits_(0), green_bits_(0), blue_bits_(0), - red_mask_(0), green_mask_(0), blue_mask_(0), - red_shift_(0), green_shift_(0), blue_shift_(0), - red_round_(0), green_round_(0), blue_round_(0) + redBits_(0), greenBits_(0), blueBits_(0), + redMask_(0), greenMask_(0), blueMask_(0), + redShift_(0), greenShift_(0), blueShift_(0), + redRound_(0), greenRound_(0), blueRound_(0) {}; /// construct with QGLcontext -- GitLab From b45df48ab7a33643321afda150a11e8440faafb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 9 May 2016 12:47:22 +0200 Subject: [PATCH 3/3] Update to latest 6.1 OM Head --- libs_required/OpenMesh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs_required/OpenMesh b/libs_required/OpenMesh index 0d3cce6d0..0837d5d1d 160000 --- a/libs_required/OpenMesh +++ b/libs_required/OpenMesh @@ -1 +1 @@ -Subproject commit 0d3cce6d0a6aab0bb138d80f7aaf6e0dc0176034 +Subproject commit 0837d5d1d05050a8fe42461c492c43244fecbb96 -- GitLab