diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2018-08-22 12:27:43 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-09-07 09:44:12 -0700 |
commit | 79bf0e8af6bf9ec829a352d56b8e70ccc8f4fa41 (patch) | |
tree | 2b646523d45f0fa9917612ed80de12bbd35d5b1e /platform/android/src/annotation/polygon.cpp | |
parent | 5911e3b13f2f2b6741e26db3e41513ed21cc95b4 (diff) | |
download | qtlocation-mapboxgl-79bf0e8af6bf9ec829a352d56b8e70ccc8f4fa41.tar.gz |
[android] jni.hpp 4.0.0
Diffstat (limited to 'platform/android/src/annotation/polygon.cpp')
-rw-r--r-- | platform/android/src/annotation/polygon.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/platform/android/src/annotation/polygon.cpp b/platform/android/src/annotation/polygon.cpp index 4168c3ceef..f22cffb100 100644 --- a/platform/android/src/annotation/polygon.cpp +++ b/platform/android/src/annotation/polygon.cpp @@ -5,8 +5,8 @@ namespace mbgl { namespace android { -mbgl::FillAnnotation Polygon::toAnnotation(jni::JNIEnv& env, jni::Object<Polygon> polygon) { - static auto javaClass = jni::Class<Polygon>::Singleton(env); +mbgl::FillAnnotation Polygon::toAnnotation(jni::JNIEnv& env, const jni::Object<Polygon>& polygon) { + static auto& javaClass = jni::Class<Polygon>::Singleton(env); static auto points = javaClass.GetField<jni::Object<java::util::List>>(env, "points"); static auto holes = javaClass.GetField<jni::Object<java::util::List>>(env, "holes"); static auto alpha = javaClass.GetField<float>(env, "alpha"); @@ -14,17 +14,14 @@ mbgl::FillAnnotation Polygon::toAnnotation(jni::JNIEnv& env, jni::Object<Polygon static auto strokeColor = javaClass.GetField<int>(env, "strokeColor"); mbgl::Polygon<double> geometry { - MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, *jni::SeizeLocal(env, polygon.Get(env, points))) + MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, polygon.Get(env, points)) }; - auto jHoleListsArray = jni::SeizeLocal(env, - java::util::List::toArray<java::util::List>(env, - *jni::SeizeLocal(env, polygon.Get(env, holes)))); + auto jHoleListsArray = java::util::List::toArray<java::util::List>(env, polygon.Get(env, holes)); - std::size_t jHoleListsSize = jHoleListsArray->Length(env); + std::size_t jHoleListsSize = jHoleListsArray.Length(env); for (std::size_t i = 0; i < jHoleListsSize; i++) { - geometry.push_back(MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, - *jni::SeizeLocal(env, jHoleListsArray->Get(env, i)))); + geometry.push_back(MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, jHoleListsArray.Get(env, i))); } mbgl::FillAnnotation annotation { geometry }; |