Merge branch '11.6' into 'master'11.6

add upstream 11.6

See merge request opensource-tracking/FreeFileSync!30

1 files changed, 1 insertions, 1 deletions

diff --git a/wx+/image_tools.h b/wx+/image_tools.h
index 1b4fbb43..0f0fb9c2 100644
--- a/wx+/image_tools.h
+++ b/wx+/image_tools.h
@@ -177,7 +177,7 @@ wxColor hsvColor(double h, double s, double v) //h within [0, 360), s, v within
 
     auto polish = [](double val) -> unsigned char
     {
-        int result = numeric::round(val * 255);
+        int result = std::round(val * 255);
         numeric::confine(result, 0, 255);
         return static_cast<unsigned char>(result);
     };