diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-10 21:56:24 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-20 13:01:59 +0300 |
commit | 22aa22c99c63b8a52746db1b757885e7feea7e26 (patch) | |
tree | 1ade0d12eef5a0d79d1a5c57428c1ef0875d95c3 /platform/android/src/jni.cpp | |
parent | 350d015cc2f70d96c08285ee358def8f0a24419e (diff) | |
download | qtlocation-mapboxgl-22aa22c99c63b8a52746db1b757885e7feea7e26.tar.gz |
[core] UnitBezier ctor is now constexpr
Diffstat (limited to 'platform/android/src/jni.cpp')
-rwxr-xr-x | platform/android/src/jni.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp index a790064d53..ef92d0112e 100755 --- a/platform/android/src/jni.cpp +++ b/platform/android/src/jni.cpp @@ -889,7 +889,7 @@ void nativeSetVisibleCoordinateBounds(JNIEnv *env, jni::jobject* obj, jlong nati if (duration > 0) { animationOptions.duration.emplace(mbgl::Milliseconds(duration)); // equivalent to kCAMediaTimingFunctionDefault in iOS - animationOptions.easing = mbgl::util::UnitBezier(0.25, 0.1, 0.25, 0.1); + animationOptions.easing.emplace(mbgl::util::UnitBezier { 0.25, 0.1, 0.25, 0.1 }); } nativeMapView->getMap().easeTo(cameraOptions, animationOptions); @@ -1054,7 +1054,7 @@ void nativeEaseTo(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr, jdoubl if (!easing) { // add a linear interpolator instead of easing - animationOptions.easing = mbgl::util::UnitBezier(0, 0, 1, 1); + animationOptions.easing.emplace(mbgl::util::UnitBezier { 0, 0, 1, 1 }); } nativeMapView->getMap().easeTo(cameraOptions, animationOptions); |