From b9ee29df305a9b546c44f3b42c3231d202bd82bb Mon Sep 17 00:00:00 2001 From: tobrun Date: Mon, 8 Jan 2018 11:29:06 +0100 Subject: raster layer changes --- platform/android/src/style/layers/raster_layer.cpp | 15 --------------- platform/android/src/style/layers/raster_layer.hpp | 2 -- 2 files changed, 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(*converted); } - jni::Object RasterLayer::getRasterFadeDurationTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = layer.as()->RasterLayer::getRasterFadeDurationTransition(); - return *convert>(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()->RasterLayer::setRasterFadeDurationTransition(options); - } - jni::Class 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 getRasterContrastTransition(jni::JNIEnv&); jni::Object getRasterFadeDuration(jni::JNIEnv&); - void setRasterFadeDurationTransition(jni::JNIEnv&, jlong duration, jlong delay); - jni::Object getRasterFadeDurationTransition(jni::JNIEnv&); jni::jobject* createJavaPeer(jni::JNIEnv&); }; // class RasterLayer -- cgit v1.2.1