diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-07 17:08:42 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-12 15:59:23 +0300 |
| commit | db25c44b78a9f7bd05c3fd40758e953401fe276b (patch) | |
| tree | bf3eea77ce4919c13f97fa78ee599bd5d2d937aa | |
| parent | 7bee780ee4bd983e9690d7ad2c92cd14a86f9c31 (diff) | |
| download | qtlocation-mapboxgl-db25c44b78a9f7bd05c3fd40758e953401fe276b.tar.gz | |
[core] GCC 4.9 does not allow using another member in a constexpr ctor
| -rw-r--r-- | include/mbgl/util/unitbezier.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/mbgl/util/unitbezier.hpp b/include/mbgl/util/unitbezier.hpp index 3a4994917b..6e644e2d1f 100644 --- a/include/mbgl/util/unitbezier.hpp +++ b/include/mbgl/util/unitbezier.hpp @@ -34,11 +34,11 @@ struct UnitBezier { // Calculate the polynomial coefficients, implicit first and last control points are (0,0) and (1,1). constexpr UnitBezier(double p1x, double p1y, double p2x, double p2y) : cx(3.0 * p1x) - , bx(3.0 * (p2x - p1x) - cx) - , ax(1.0 - cx - bx) + , bx(3.0 * (p2x - p1x) - (3.0 * p1x)) + , ax(1.0 - (3.0 * p1x) - (3.0 * (p2x - p1x) - (3.0 * p1x))) , cy(3.0 * p1y) - , by(3.0 * (p2y - p1y) - cy) - , ay(1.0 - cy - by) { + , by(3.0 * (p2y - p1y) - (3.0 * p1y)) + , ay(1.0 - (3.0 * p1y) - (3.0 * (p2y - p1y) - (3.0 * p1y))) { } double sampleCurveX(double t) const { |