From bcf647342a9643fedfba6d9ebc3be56bcc4c1cf1 Mon Sep 17 00:00:00 2001 From: AJR Date: Wed, 3 Feb 2021 17:45:21 -0500 Subject: Use std::clamp in various core functions --- src/emu/render.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/emu/render.cpp') diff --git a/src/emu/render.cpp b/src/emu/render.cpp index 3ef1fb32fec..5e2c023bf4e 100644 --- a/src/emu/render.cpp +++ b/src/emu/render.cpp @@ -1216,8 +1216,8 @@ void render_target::compute_visible_area(s32 target_width, s32 target_height, fl // now apply desired scale mode and aspect correction if (m_keepaspect && target_aspect > src_aspect) xscale *= src_aspect / target_aspect * (maxyscale / yscale); if (m_keepaspect && target_aspect < src_aspect) yscale *= target_aspect / src_aspect * (maxxscale / xscale); - if (x_is_integer) xscale = std::min(maxxscale, std::max(1.0f, render_round_nearest(xscale))); - if (y_is_integer) yscale = std::min(maxyscale, std::max(1.0f, render_round_nearest(yscale))); + if (x_is_integer) xscale = std::clamp(render_round_nearest(xscale), 1.0f, maxxscale); + if (y_is_integer) yscale = std::clamp(render_round_nearest(yscale), 1.0f, maxyscale); // check if we have user defined scale factors, if so use them instead int user_scale_x = target_is_portrait? m_int_scale_y : m_int_scale_x; -- cgit v1.2.3-70-g09d2