From 589db026ec211bc4979e3bffe074f6e48ce7cedc Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 1 Sep 2019 14:12:14 +0300 Subject: [PATCH] Support C++14. --- src/lottie/lottieparser.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lottie/lottieparser.cpp b/src/lottie/lottieparser.cpp index 841b462524..1cc7febfc4 100644 --- a/src/lottie/lottieparser.cpp +++ b/src/lottie/lottieparser.cpp @@ -804,14 +804,17 @@ LottieColor LottieParserImpl::applyReplacements(const LottieColor &color) return color; } const auto convert = [](float value) { - return std::uint32_t(std::round(std::clamp(value, 0.f, 1.f) * 255.)); + return std::uint32_t( + std::round(std::min(std::max(value, 0.f), 1.f) * 255.)); }; const auto part = [](std::uint32_t value, int shift) { return float((value >> shift) & 0xFFU) / 255.f; - }; + }; const auto converted = convert(color.b) | (convert(color.g) << 8) | (convert(color.r) << 16); - for (const auto [key, value] : mColorReplacements) { + for (const auto &pair : mColorReplacements) { + const auto key = pair.first; + const auto value = pair.second; if (key == converted) { return LottieColor(part(value, 16), part(value, 8), part(value, 0)); }