diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-09-30 13:07:53 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-09-30 13:07:53 -0400 |
| commit | ba4220b1354384e0ae2bbe7d0a39082bbc5766f9 (patch) | |
| tree | 4e1cceea6a4dcf9c628853121bfa965c8e1b0a23 /libs/surfaces | |
| parent | 8d3058045079c162140a0f8e9cca5d3d75f1f6e8 (diff) | |
fix some compiler warnings (from mingw)
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/push2/scale.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libs/surfaces/push2/scale.cc b/libs/surfaces/push2/scale.cc index 8a1a16d0a4..ac77c4ca32 100644 --- a/libs/surfaces/push2/scale.cc +++ b/libs/surfaces/push2/scale.cc @@ -184,7 +184,7 @@ ScaleLayout::button_upper (uint32_t n) return; } - int root; + int root = 0; switch (n) { case 1: @@ -227,7 +227,7 @@ ScaleLayout::button_lower (uint32_t n) return; } - int root; + int root = 0; switch (n) { case 1: @@ -460,9 +460,9 @@ ScaleLayout::show_root_state () Pango::FontDescription fd ("Sans 10"); uint32_t highlight_text = 0; - vector<Text*>* none_text_array; - vector<Text*>* one_text_array; - Push2::ButtonID bid; + vector<Text*>* none_text_array = 0; + vector<Text*>* one_text_array = 0; + Push2::ButtonID bid = Push2::Upper2; /* keep compilers quiet */ switch (p2.scale_root()) { case 0: @@ -537,6 +537,8 @@ ScaleLayout::show_root_state () one_text_array = &upper_text; bid = Push2::Upper7; break; + default: + return; } if (none_text_array) { |