From b19d26a73547028e4db002d02d5f10c530083f7f Mon Sep 17 00:00:00 2001 From: Bryant Date: Wed, 3 Jul 2013 14:05:14 -0700 Subject: [PATCH 1/2] Missing paren crashes windows compilation --- src/ui/MainWindow.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index 1abeebe..d22810a 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -231,7 +231,7 @@ void MainWindow::init() joystick = new JoystickInput(); #ifdef MOUSE_ENABLED_WIN - emit initStatusChanged(tr("Initializing 3D mouse interface", Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141)); + emit initStatusChanged(tr("Initializing 3D mouse interface"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141)); mouseInput = new Mouse3DInput(this); mouse = new Mouse6dofInput(mouseInput); From 35bf270076d06f8ffb67165d174e4a6d8be2e70f Mon Sep 17 00:00:00 2001 From: Bryant Date: Wed, 3 Jul 2013 14:06:24 -0700 Subject: [PATCH 2/2] Windows compilation fails due to differing datatypes for input to pow() function. --- src/ui/PrimaryFlightDisplay.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/PrimaryFlightDisplay.cpp b/src/ui/PrimaryFlightDisplay.cpp index b5a732b..695c9e4 100644 --- a/src/ui/PrimaryFlightDisplay.cpp +++ b/src/ui/PrimaryFlightDisplay.cpp @@ -112,7 +112,7 @@ */ double PrimaryFlightDisplay_round(double value, int digits=0) { - return floor(value * pow(10, digits) + 0.5) / pow(10, digits); + return floor(value * pow(10.0, digits) + 0.5) / pow(10.0, digits); } const int PrimaryFlightDisplay::tickValues[] = {10, 20, 30, 45, 60};