fix some compiler warnings (from mingw)
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 30 Sep 2016 17:07:53 +0000 (13:07 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 30 Sep 2016 17:07:53 +0000 (13:07 -0400)
libs/surfaces/push2/scale.cc

index 8a1a16d0a48bd67527f4a9c50bc29e8627a9e100..ac77c4ca324c81cc9a794efbf7d1e0391d75ef0e 100644 (file)
@@ -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) {