[android] added missing delete local references

This commit is contained in:
Osana Babayan
2018-02-19 12:08:35 -05:00
committed by GitHub
parent d3e6fc5eff
commit d0f66b132f
4 changed files with 35 additions and 21 deletions

View File

@@ -1,6 +1,8 @@
#include <android/log.h>
#include "point.hpp"
#include "../java/util.hpp"
#include "../java_types.hpp"
#include "../style/value.hpp"
namespace mbgl {
namespace android {
@@ -19,17 +21,23 @@ mapbox::geojson::point Point::convert(jni::JNIEnv &env, jni::Object<Point> jPoin
}
mapbox::geojson::point Point::convert(jni::JNIEnv &env, jni::Object<java::util::List/*<Double>*/> jDoubleList) {
auto jDoubleArray = java::util::List::toArray<double>(env, jDoubleList);
mapbox::geojson::point point;
jni::jdouble lon = jni::CallMethod<jni::jdouble>(env,
jDoubleArray.Get(env, 0),
*java::Number::doubleValueMethodId);
jni::jdouble lat = jni::CallMethod<jni::jdouble>(env,
jDoubleArray.Get(env, 1),
*java::Number::doubleValueMethodId);
mapbox::geojson::point point(lon, lat);
jni::DeleteLocalRef(env, jDoubleArray);
if (jDoubleList) {
auto jDoubleArray = java::util::List::toArray<jobject>(env, jDoubleList);
auto lonObject = jDoubleArray.Get(env, 0);
auto latObject = jDoubleArray.Get(env, 1);
point.x = jni::CallMethod<jni::jdouble>(env, lonObject,
*java::Number::doubleValueMethodId);
point.y = jni::CallMethod<jni::jdouble>(env, latObject,
*java::Number::doubleValueMethodId);
jni::DeleteLocalRef(env, lonObject);
jni::DeleteLocalRef(env, latObject);
jni::DeleteLocalRef(env, jDoubleArray);
}
return point;
}