summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2016-09-29 13:28:40 +0000
committerManolo Gouy <Manolo>2016-09-29 13:28:40 +0000
commiteabbc41ef156e54aee047e3c1bd6d2de5989f030 (patch)
treea87752490ca15ab611634ec406ad3dc38828bbf2
parent42624dc17f5010763a182f3144cd97cd5667ceac (diff)
Avoid compilation warnings with -Wmaybe-uninitialized
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11993 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/Fl_win32.cxx2
-rw-r--r--src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index 5bd64165f..04facd944 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -2390,7 +2390,7 @@ void Fl_WinAPI_Window_Driver::capture_titlebar_and_borders(Fl_Shared_Image*& top
top = left = bottom = right = NULL;
if (!shown() || parent() || !border() || !visible()) return;
int wsides, hbottom, bt;
- float scaling;
+ float scaling = 1;
RECT r = border_width_title_bar_height(wsides, hbottom, bt, &scaling);
int htop = bt + hbottom;
Fl_Surface_Device *previous = Fl_Surface_Device::surface();
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
index 88afaecbf..eb8e13b33 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
@@ -112,7 +112,7 @@ int Fl_WinAPI_Window_Driver::decorated_w()
int Fl_WinAPI_Window_Driver::decorated_h()
{
int bt, bx, by;
- float scaling;
+ float scaling = 1;
border_width_title_bar_height(bx, by, bt, &scaling);
return h() + bt/scaling + 2 * by;
}