summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-07-12 18:48:11 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-07-13 11:57:09 +0300
commit761c9d44b28f8d0f5fed3c476ce8b2636c4dafcc (patch)
tree86a050ae8ed3fa07aefcb7602a6c1236835b87d6
parentc670b08ecb431b1bfd02da748de3d9fa16a757ec (diff)
downloadqtlocation-mapboxgl-761c9d44b28f8d0f5fed3c476ce8b2636c4dafcc.tar.gz
[android] Update {Line,Fill}Annotation properties setter
-rwxr-xr-xplatform/android/src/jni.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp
index 311f97b3d9..1870cb433f 100755
--- a/platform/android/src/jni.cpp
+++ b/platform/android/src/jni.cpp
@@ -754,9 +754,9 @@ jni::jarray<jlong>* nativeAddPolylines(JNIEnv *env, jni::jobject* obj, jlong nat
jni::jobject* points = jni::GetField<jni::jobject*>(*env, polyline, *polylinePointsId);
mbgl::LineAnnotation annotation { toGeometry<mbgl::LineString<double>>(env, points) };
- annotation.opacity = jni::GetField<jfloat>(*env, polyline, *polylineAlphaId);
- annotation.color = toColor(jni::GetField<jint>(*env, polyline, *polylineColorId));
- annotation.width = jni::GetField<jfloat>(*env, polyline, *polylineWidthId);
+ annotation.opacity = { jni::GetField<jfloat>(*env, polyline, *polylineAlphaId) };
+ annotation.color = { toColor(jni::GetField<jint>(*env, polyline, *polylineColorId)) };
+ annotation.width = { jni::GetField<jfloat>(*env, polyline, *polylineWidthId) };
ids.push_back(nativeMapView->getMap().addAnnotation(annotation));
jni::DeleteLocalRef(*env, polyline);
@@ -781,9 +781,9 @@ jni::jarray<jlong>* nativeAddPolygons(JNIEnv *env, jni::jobject* obj, jlong nati
jni::jobject* points = jni::GetField<jni::jobject*>(*env, polygon, *polygonPointsId);
mbgl::FillAnnotation annotation { mbgl::Polygon<double> { toGeometry<mbgl::LinearRing<double>>(env, points) } };
- annotation.opacity = jni::GetField<jfloat>(*env, polygon, *polygonAlphaId);
- annotation.outlineColor = toColor(jni::GetField<jint>(*env, polygon, *polygonStrokeColorId));
- annotation.color = toColor(jni::GetField<jint>(*env, polygon, *polygonFillColorId));
+ annotation.opacity = { jni::GetField<jfloat>(*env, polygon, *polygonAlphaId) };
+ annotation.outlineColor = { toColor(jni::GetField<jint>(*env, polygon, *polygonStrokeColorId)) };
+ annotation.color = { toColor(jni::GetField<jint>(*env, polygon, *polygonFillColorId)) };
ids.push_back(nativeMapView->getMap().addAnnotation(annotation));
jni::DeleteLocalRef(*env, polygon);