summaryrefslogtreecommitdiff
path: root/platform/android/src/gson/json_element.cpp
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2019-02-06 12:47:04 +0100
committerŁukasz Paczos <lukas.paczos@gmail.com>2019-02-06 12:59:32 +0100
commit8cb99d4722ee1bc876a25a6d878ada8d5b0b8c5c (patch)
tree6e9f5943bbec7569a5f6cb022bade95670c93911 /platform/android/src/gson/json_element.cpp
parent47852b6c42b7884dbb7ad107a112c7e0d9f96ed0 (diff)
downloadqtlocation-mapboxgl-8cb99d4722ee1bc876a25a6d878ada8d5b0b8c5c.tar.gz
[android] cast round json element properties to int64_t instead of the uint64_tupstream/lp-13881-negative-conversion
Diffstat (limited to 'platform/android/src/gson/json_element.cpp')
-rw-r--r--platform/android/src/gson/json_element.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/src/gson/json_element.cpp b/platform/android/src/gson/json_element.cpp
index 405efe71ca..521f135b7f 100644
--- a/platform/android/src/gson/json_element.cpp
+++ b/platform/android/src/gson/json_element.cpp
@@ -68,8 +68,8 @@ mbgl::Value JsonElement::convert(jni::JNIEnv &env, const jni::Object<JsonElement
} else if (primitive.Call(env, isNumber)) {
auto value = primitive.Call(env, getAsDouble);
if (value == math::Math::rint(env, value)) {
- // uint64_t
- return static_cast<uint64_t>(primitive.Call(env, getAsInteger));
+ // int64_t
+ return static_cast<int64_t>(primitive.Call(env, getAsInteger));
} else {
// double
return value;