diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2018-01-08 11:23:46 +0100 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2018-01-09 17:04:44 +0100 |
commit | 068d2f267f424e4e00a6dcedb323d5e6b492dd94 (patch) | |
tree | 57edfa3b6cc8c6b92808e4af3d896bbe000c90a4 /platform/android/src/style/layers/raster_layer.cpp | |
parent | c7b2c5c6010cc853ac18f99dc8702f8e6c83e6fd (diff) | |
download | qtlocation-mapboxgl-068d2f267f424e4e00a6dcedb323d5e6b492dd94.tar.gz |
[android] - fix code generation, remove lamda, fixup color conversion locale
Diffstat (limited to 'platform/android/src/style/layers/raster_layer.cpp')
-rw-r--r-- | platform/android/src/style/layers/raster_layer.cpp | 15 |
1 files changed, 0 insertions, 15 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")); } |