diff options
| author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2020-10-13 16:20:44 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 16:20:44 -0300 |
| commit | c5b3c8d06bcfa343b2cecbfc60b3530b306ebe88 (patch) | |
| tree | 9565ff464bbb9e5a0aa66e6e310098314e88d019 /src/core/frontend/framebuffer_layout.cpp | |
| parent | d291fc1a517d0db07e4b32f5b4ad294c5e93e984 (diff) | |
| parent | 39c8d18feba8eafcd43fbb55e73ae150a1947aad (diff) | |
Merge pull request #4786 from lioncash/flags
core/CMakeLists: Make some warnings errors
Diffstat (limited to 'src/core/frontend/framebuffer_layout.cpp')
| -rw-r--r-- | src/core/frontend/framebuffer_layout.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/frontend/framebuffer_layout.cpp b/src/core/frontend/framebuffer_layout.cpp index c1fbc235ba..1acc82497f 100644 --- a/src/core/frontend/framebuffer_layout.cpp +++ b/src/core/frontend/framebuffer_layout.cpp @@ -14,8 +14,8 @@ namespace Layout { template <class T> static Common::Rectangle<T> MaxRectangle(Common::Rectangle<T> window_area, float screen_aspect_ratio) { - float scale = std::min(static_cast<float>(window_area.GetWidth()), - window_area.GetHeight() / screen_aspect_ratio); + const float scale = std::min(static_cast<float>(window_area.GetWidth()), + static_cast<float>(window_area.GetHeight()) / screen_aspect_ratio); return Common::Rectangle<T>{0, 0, static_cast<T>(std::round(scale)), static_cast<T>(std::round(scale * screen_aspect_ratio))}; } @@ -27,7 +27,7 @@ FramebufferLayout DefaultFrameLayout(u32 width, u32 height) { // so just calculate them both even if the other isn't showing. FramebufferLayout res{width, height, false, {}}; - const float window_aspect_ratio = static_cast<float>(height) / width; + const float window_aspect_ratio = static_cast<float>(height) / static_cast<float>(width); const float emulation_aspect_ratio = EmulationAspectRatio( static_cast<AspectRatio>(Settings::values.aspect_ratio.GetValue()), window_aspect_ratio); |