diff options
| -rw-r--r-- | src/3rdparty/easing/easing.cpp | 8 | ||||
| -rw-r--r-- | src/gui/painting/qbezier.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/easing/easing.cpp b/src/3rdparty/easing/easing.cpp index 7d70a4d..3cc71fa 100644 --- a/src/3rdparty/easing/easing.cpp +++ b/src/3rdparty/easing/easing.cpp @@ -1,4 +1,4 @@ -/* +/* Disclaimer for Robert Penner's Easing Equations license: TERMS OF USE - EASING EQUATIONS @@ -554,13 +554,13 @@ static qreal easeOutBounce_helper(qreal t, qreal c, qreal a) if (t < (4/11.0)) { return c*(7.5625*t*t); } else if (t < (8/11.0)) { - t -= (6/11.0); + t -= qreal(6/11.0); return -a * (1. - (7.5625*t*t + .75)) + c; } else if (t < (10/11.0)) { - t -= (9/11.0); + t -= qreal(9/11.0); return -a * (1. - (7.5625*t*t + .9375)) + c; } else { - t -= (21/22.0); + t -= qreal(21/22.0); return -a * (1. - (7.5625*t*t + .984375)) + c; } } diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp index a08c79e..147fbf9 100644 --- a/src/gui/painting/qbezier.cpp +++ b/src/gui/painting/qbezier.cpp @@ -118,7 +118,7 @@ QBezier QBezier::mapBy(const QTransform &transform) const } //0.05 is really low, but required for scaled-up beziers... -static const qreal flatness = 0.05; +static const qreal flatness = qreal(0.05); //based on "Fast, precise flattening of cubic Bezier path and offset curves" // by T. F. Hain, A. L. Ahmad, S. V. R. Racherla and D. D. Langan |