QtLottie: Rebase onto upstream/dev.

This commit is contained in:
John Preston 2019-05-02 12:43:55 +04:00
parent 2caa3e3def
commit da845a089e
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit 44fa230637dafe2fe01ffc6e93c3e3f5841dcc5a Subproject commit 1e81797fd7ec924f49e13866b08f57708537251a

View File

@ -437,7 +437,7 @@ public:
qreal easedValue = easing->easing.valueForProgress(progress); qreal easedValue = easing->easing.valueForProgress(progress);
// For the time being, 4D vectors are used only for colors, and // For the time being, 4D vectors are used only for colors, and
// the value must be restricted to between [0, 1] // 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 sv = easing->startValue;
T ev = easing->endValue; T ev = easing->endValue;
qreal x = sv.x() + easedValue * (ev.x() - sv.x()); qreal x = sv.x() + easedValue * (ev.x() - sv.x());