summaryrefslogtreecommitdiff
path: root/platform/android/src/style/conversion/filter.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2018-08-17 13:43:07 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2018-09-07 09:44:12 -0700
commit53c3c327f0ebea276d977f58a59cdb9449165518 (patch)
tree1315a80a1c24f24dd1cbd4e00cf85083be16ce45 /platform/android/src/style/conversion/filter.cpp
parent6806ba5b52129050c0944bd7c8b1fe285baeeddc (diff)
downloadqtlocation-mapboxgl-53c3c327f0ebea276d977f58a59cdb9449165518.tar.gz
[android] Upgrade to latest jni.hpp
Diffstat (limited to 'platform/android/src/style/conversion/filter.cpp')
-rw-r--r--platform/android/src/style/conversion/filter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/src/style/conversion/filter.cpp b/platform/android/src/style/conversion/filter.cpp
index 4eac0cf82b..44b5a71aa3 100644
--- a/platform/android/src/style/conversion/filter.cpp
+++ b/platform/android/src/style/conversion/filter.cpp
@@ -8,11 +8,11 @@ namespace mbgl {
namespace android {
namespace conversion {
-optional<mbgl::style::Filter> toFilter(jni::JNIEnv& env, jni::Array<jni::Object<>> jfilter) {
+optional<mbgl::style::Filter> toFilter(jni::JNIEnv& env, jni::Local<jni::Array<jni::Object<>>> jfilter) {
mbgl::optional<mbgl::style::Filter> filter;
if (jfilter) {
mbgl::style::conversion::Error error;
- auto converted = mbgl::style::conversion::convert<mbgl::style::Filter>(Value(env, jfilter), error);
+ auto converted = mbgl::style::conversion::convert<mbgl::style::Filter>(Value(env, std::move(jfilter)), error);
if (!converted) {
mbgl::Log::Error(mbgl::Event::JNI, "Error converting filter: " + error.message);
}
@@ -23,4 +23,4 @@ optional<mbgl::style::Filter> toFilter(jni::JNIEnv& env, jni::Array<jni::Object<
} // namespace conversion
} // namespace android
-} // namespace mbgl \ No newline at end of file
+} // namespace mbgl