From 8e0b80aa369df7d1142053f077df928106c6ce8c Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Wed, 4 Apr 2018 07:42:40 +0200 Subject: Fix last performance-type-promotion-in-math-fn problems --- src/fontengine.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/fontengine.cpp') diff --git a/src/fontengine.cpp b/src/fontengine.cpp index b40e1ef0f..dc98fb1e4 100644 --- a/src/fontengine.cpp +++ b/src/fontengine.cpp @@ -18,6 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #include "fontengine.h" +#include #include "client/renderingengine.h" #include "config.h" #include "porting.h" @@ -309,10 +310,10 @@ void FontEngine::initFont(unsigned int basesize, FontMode mode) } #if USE_FREETYPE else { - if (! is_yes(m_settings->get("freetype"))) { + if (!is_yes(m_settings->get("freetype"))) { return; } - unsigned int size = floor(RenderingEngine::getDisplayDensity() * + u32 size = std::floor(RenderingEngine::getDisplayDensity() * m_settings->getFloat("gui_scaling") * basesize); u32 font_shadow = 0; u32 font_shadow_alpha = 0; @@ -428,7 +429,7 @@ void FontEngine::initSimpleFont(unsigned int basesize, FontMode mode) if (basesize == FONT_SIZE_UNSPECIFIED) basesize = DEFAULT_FONT_SIZE; - unsigned int size = floor( + u32 size = std::floor( RenderingEngine::getDisplayDensity() * m_settings->getFloat("gui_scaling") * basesize); -- cgit v1.2.3