From da845a089eba5b25365fb0c1f4a172f7ef78eae2 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 2 May 2019 12:43:55 +0400 Subject: [PATCH] QtLottie: Rebase onto upstream/dev. --- Telegram/ThirdParty/qtlottie | 2 +- .../qtlottie_helper/QtBodymovin/private/bmproperty_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Telegram/ThirdParty/qtlottie b/Telegram/ThirdParty/qtlottie index 44fa230637..1e81797fd7 160000 --- a/Telegram/ThirdParty/qtlottie +++ b/Telegram/ThirdParty/qtlottie @@ -1 +1 @@ -Subproject commit 44fa230637dafe2fe01ffc6e93c3e3f5841dcc5a +Subproject commit 1e81797fd7ec924f49e13866b08f57708537251a diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmproperty_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmproperty_p.h index 0a304a28d8..67fb88cc5e 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmproperty_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmproperty_p.h @@ -437,7 +437,7 @@ public: qreal easedValue = easing->easing.valueForProgress(progress); // For the time being, 4D vectors are used only for colors, and // the value must be restricted to between [0, 1] - easedValue = qBound(0.0, easedValue, 1.0); + easedValue = qBound(qreal(0.0), easedValue, qreal(1.0)); T sv = easing->startValue; T ev = easing->endValue; qreal x = sv.x() + easedValue * (ev.x() - sv.x());