diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2018-01-08 11:29:06 +0100 |
---|---|---|
committer | tobrun <tobrun.van.nuland@gmail.com> | 2018-01-08 11:29:06 +0100 |
commit | b9ee29df305a9b546c44f3b42c3231d202bd82bb (patch) | |
tree | d377f5d68df567ff74c2bf82e71a7243c11da8e2 | |
parent | b8ed1374860f2feb2c27a5d1f2ea26b7827c5964 (diff) | |
download | qtlocation-mapboxgl-b9ee29df305a9b546c44f3b42c3231d202bd82bb.tar.gz |
raster layer changesupstream/tvn-fix-generated-code
-rw-r--r-- | platform/android/src/style/layers/raster_layer.cpp | 15 | ||||
-rw-r--r-- | platform/android/src/style/layers/raster_layer.hpp | 2 |
2 files changed, 0 insertions, 17 deletions
diff --git a/platform/android/src/style/layers/raster_layer.cpp b/platform/android/src/style/layers/raster_layer.cpp index 98923d5129..6d36298bb1 100644 --- a/platform/android/src/style/layers/raster_layer.cpp +++ b/platform/android/src/style/layers/raster_layer.cpp @@ -155,19 +155,6 @@ namespace android { return jni::Object<jni::ObjectTag>(*converted); } - jni::Object<TransitionOptions> RasterLayer::getRasterFadeDurationTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = layer.as<mbgl::style::RasterLayer>()->RasterLayer::getRasterFadeDurationTransition(); - return *convert<jni::Object<TransitionOptions>>(env, options); - } - - void RasterLayer::setRasterFadeDurationTransition(jni::JNIEnv&, jlong duration, jlong delay) { - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); - layer.as<mbgl::style::RasterLayer>()->RasterLayer::setRasterFadeDurationTransition(options); - } - jni::Class<RasterLayer> RasterLayer::javaClass; @@ -206,8 +193,6 @@ namespace android { METHOD(&RasterLayer::getRasterContrastTransition, "nativeGetRasterContrastTransition"), METHOD(&RasterLayer::setRasterContrastTransition, "nativeSetRasterContrastTransition"), METHOD(&RasterLayer::getRasterContrast, "nativeGetRasterContrast"), - METHOD(&RasterLayer::getRasterFadeDurationTransition, "nativeGetRasterFadeDurationTransition"), - METHOD(&RasterLayer::setRasterFadeDurationTransition, "nativeSetRasterFadeDurationTransition"), METHOD(&RasterLayer::getRasterFadeDuration, "nativeGetRasterFadeDuration")); } diff --git a/platform/android/src/style/layers/raster_layer.hpp b/platform/android/src/style/layers/raster_layer.hpp index 3b119ee0d2..ed6fc3e1b2 100644 --- a/platform/android/src/style/layers/raster_layer.hpp +++ b/platform/android/src/style/layers/raster_layer.hpp @@ -54,8 +54,6 @@ public: jni::Object<TransitionOptions> getRasterContrastTransition(jni::JNIEnv&); jni::Object<jni::ObjectTag> getRasterFadeDuration(jni::JNIEnv&); - void setRasterFadeDurationTransition(jni::JNIEnv&, jlong duration, jlong delay); - jni::Object<TransitionOptions> getRasterFadeDurationTransition(jni::JNIEnv&); jni::jobject* createJavaPeer(jni::JNIEnv&); }; // class RasterLayer |