From f3cef48328d2d62a82b48f86f246cf3d4cf2061c Mon Sep 17 00:00:00 2001 From: Mikael Olenfalk Date: Sun, 22 Mar 2020 17:33:38 +0100 Subject: [PATCH] Fix more narrow conversion warnings --- examples/dom/gauge.cpp | 3 ++- examples/dom/graph.cpp | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/dom/gauge.cpp b/examples/dom/gauge.cpp index 2fe63e84..db2ba7a9 100644 --- a/examples/dom/gauge.cpp +++ b/examples/dom/gauge.cpp @@ -5,12 +5,13 @@ #include "ftxui/dom/elements.hpp" #include "ftxui/screen/screen.hpp" + int main(int argc, const char* argv[]) { using namespace ftxui; using namespace std::chrono_literals; std::string reset_position; - for (float percentage = 0; percentage <= 1.0; percentage += 0.002) { + for (float percentage = 0.0f; percentage <= 1.0f; percentage += 0.002f) { std::wstring data_downloaded = std::to_wstring(int(percentage * 5000)) + L"/5000"; // clang-format off diff --git a/examples/dom/graph.cpp b/examples/dom/graph.cpp index c92e3af0..96bd573f 100644 --- a/examples/dom/graph.cpp +++ b/examples/dom/graph.cpp @@ -7,18 +7,19 @@ #include "ftxui/screen/screen.hpp" #include "ftxui/screen/string.hpp" + class Graph { public: std::vector operator()(int width, int height) { std::vector output(width); for (int i = 0; i < width; ++i) { float v = 0; - v += 0.1 * sin((i + shift) * 0.1); - v += 0.2 * sin((i + shift + 10) * 0.15); - v += 0.1 * sin((i + shift) * 0.03); + v += 0.1f * sin((i + shift) * 0.1f); + v += 0.2f * sin((i + shift + 10) * 0.15f); + v += 0.1f * sin((i + shift) * 0.03f); v *= height; - v += 0.5 * height; - output[i] = v; + v += 0.5f * height; + output[i] = static_cast(v); } return output; }