From 56d05b166ba2c8687a70927d3d2de21430377ac2 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Mon, 19 Aug 2024 15:48:22 -0400 Subject: [PATCH] Make more use of std::clamp in surface utils --- src/sdl/utils.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/sdl/utils.cpp b/src/sdl/utils.cpp index 83837db9e08..d2e0d53a8de 100644 --- a/src/sdl/utils.cpp +++ b/src/sdl/utils.cpp @@ -414,9 +414,9 @@ void adjust_surface_color(surface& nsurf, int red, int green, int blue) g = (*beg) >> 8; b = (*beg) >> 0; - r = std::max(0,std::min(255,static_cast(r)+red)); - g = std::max(0,std::min(255,static_cast(g)+green)); - b = std::max(0,std::min(255,static_cast(b)+blue)); + r = std::clamp(static_cast(r) + red, 0, 255); + g = std::clamp(static_cast(g) + green, 0, 255); + b = std::clamp(static_cast(b) + blue, 0, 255); *beg = (alpha << 24) + (r << 16) + (g << 8) + b; } @@ -793,7 +793,7 @@ void adjust_surface_alpha_add(surface& nsurf, int amount) g = (*beg) >> 8; b = (*beg); - alpha = uint8_t(std::max(0,std::min(255,static_cast(alpha) + amount))); + alpha = uint8_t(std::clamp(static_cast(alpha) + amount, 0, 255)); *beg = (alpha << 24) + (r << 16) + (g << 8) + b; } @@ -946,9 +946,9 @@ void light_surface(surface& nsurf, const surface &lightmap) int dg = (static_cast(lg) - 128) * 2; int db = (static_cast(lb) - 128) * 2; //note that r + dr will promote r to int (needed to avoid uint8_t math) - r = std::max(0,std::min(255, r + dr)); - g = std::max(0,std::min(255, g + dg)); - b = std::max(0,std::min(255, b + db)); + r = std::clamp(r + dr, 0, 255); + g = std::clamp(g + dg, 0, 255); + b = std::clamp(b + db, 0, 255); *beg = (alpha << 24) + (r << 16) + (g << 8) + b; }