diff options
| author | B Stack <bgstack15@gmail.com> | 2018-11-15 11:22:00 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2018-11-15 11:22:00 +0000 |
| commit | 77c5c2503d459288720a8894349ac74e5eeec7c6 (patch) | |
| tree | 30bf08d782d58174a0ca212b2e4b172fabd9c42c /wx+/image_resources.cpp | |
| parent | Merge branch '10.5' into 'master' (diff) | |
| parent | 10.6 (diff) | |
| download | FreeFileSync-77c5c2503d459288720a8894349ac74e5eeec7c6.tar.gz FreeFileSync-77c5c2503d459288720a8894349ac74e5eeec7c6.tar.bz2 FreeFileSync-77c5c2503d459288720a8894349ac74e5eeec7c6.zip | |
Merge branch '10.6' into 'master'10.6
10.6
See merge request opensource-tracking/FreeFileSync!3
Diffstat (limited to 'wx+/image_resources.cpp')
| -rwxr-xr-x | wx+/image_resources.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wx+/image_resources.cpp b/wx+/image_resources.cpp index d09a188b..5bc8006f 100755 --- a/wx+/image_resources.cpp +++ b/wx+/image_resources.cpp @@ -214,7 +214,7 @@ void GlobalBitmaps::init(const Zstring& filePath) //do NOT rely on wxConvLocal! On failure shows unhelpful popup "Cannot convert from the charset 'Unknown encoding (-1)'!" //do we need xBRZ scaling for high quality DPI images? - const int hqScale = numeric::clampCpy<int>(std::ceil(fastFromDIP(1000) / 1000.0), 1, xbrz::SCALE_FACTOR_MAX); + const int hqScale = std::clamp<int>(std::ceil(fastFromDIP(1000) / 1000.0), 1, xbrz::SCALE_FACTOR_MAX); //even for 125% DPI scaling, "2xBRZ + bilinear downscale" gives a better result than mere "125% bilinear upscale"! if (hqScale > 1) dpiScaler_ = std::make_unique<DpiParallelScaler>(hqScale); |