diff options
Diffstat (limited to 'platform/android/src/geojson/line_string.cpp')
-rw-r--r-- | platform/android/src/geojson/line_string.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/platform/android/src/geojson/line_string.cpp b/platform/android/src/geojson/line_string.cpp index 5a18a02bb7..ae1345c958 100644 --- a/platform/android/src/geojson/line_string.cpp +++ b/platform/android/src/geojson/line_string.cpp @@ -7,42 +7,41 @@ namespace mbgl { namespace android { namespace geojson { -jni::Object<LineString> LineString::New(jni::JNIEnv& env, const mbgl::LineString<double>& lineString) { - static auto javaClass = jni::Class<LineString>::Singleton(env); +jni::Local<jni::Object<LineString>> LineString::New(jni::JNIEnv& env, const mbgl::LineString<double>& lineString) { + static auto& javaClass = jni::Class<LineString>::Singleton(env); static auto method = javaClass.GetStaticMethod<jni::Object<LineString>(jni::Object<java::util::List>)>(env, "fromLngLats"); - return javaClass.Call(env, method, - *jni::SeizeLocal(env, asPointsList(env, lineString))); + return javaClass.Call(env, method, asPointsList(env, lineString)); } -mapbox::geojson::line_string LineString::convert(jni::JNIEnv &env, jni::Object<LineString> jLineString) { +mapbox::geojson::line_string LineString::convert(jni::JNIEnv &env, const jni::Object<LineString>& jLineString) { mapbox::geojson::line_string lineString; if (jLineString) { - lineString = LineString::convert(env, *jni::SeizeLocal(env, LineString::coordinates(env, jLineString))); + lineString = LineString::convert(env, LineString::coordinates(env, jLineString)); } return lineString; } -mapbox::geojson::line_string LineString::convert(jni::JNIEnv &env, jni::Object<java::util::List/*<Point>*/> jPointList) { +mapbox::geojson::line_string LineString::convert(jni::JNIEnv &env, const jni::Object<java::util::List/*<Point>*/>& jPointList) { mapbox::geojson::line_string lineString; if (jPointList) { - auto jPointArray = jni::SeizeLocal(env, java::util::List::toArray<Point>(env, jPointList)); - auto size = jPointArray->Length(env); + auto jPointArray = java::util::List::toArray<Point>(env, jPointList); + auto size = jPointArray.Length(env); lineString.reserve(size); for (std::size_t i = 0; i < size; i++) { - lineString.push_back(Point::convert(env, *jni::SeizeLocal(env, jPointArray->Get(env, i)))); + lineString.push_back(Point::convert(env, jPointArray.Get(env, i))); } } return lineString; } -jni::Object<java::util::List> LineString::coordinates(jni::JNIEnv &env, jni::Object<LineString> jLineString) { - static auto javaClass = jni::Class<LineString>::Singleton(env); +jni::Local<jni::Object<java::util::List>> LineString::coordinates(jni::JNIEnv &env, const jni::Object<LineString>& jLineString) { + static auto& javaClass = jni::Class<LineString>::Singleton(env); static auto method = javaClass.GetMethod<jni::Object<java::util::List> ()>(env, "coordinates"); return jLineString.Call(env, method); } |