diff options
| author | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-05-31 11:53:04 -0700 |
|---|---|---|
| committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-06-01 15:38:01 -0700 |
| commit | 8b37a0704c7c20b1664fee3dfcc79139982a1ce7 (patch) | |
| tree | 9c0a50330b7e4f152a3a9ee25685fcbe8b9a4df4 /platform | |
| parent | 843da07b28a840fd850056c4b15d492ccc76a646 (diff) | |
| download | qtlocation-mapboxgl-8b37a0704c7c20b1664fee3dfcc79139982a1ce7.tar.gz | |
[core] Use fixed-size std::array for ImageSource coordinates
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/src/style/android_conversion.hpp | 3 | ||||
| -rw-r--r-- | platform/default/mbgl/storage/offline_download.cpp | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/platform/android/src/style/android_conversion.hpp b/platform/android/src/style/android_conversion.hpp index 790c82a1c0..6327ed96d0 100644 --- a/platform/android/src/style/android_conversion.hpp +++ b/platform/android/src/style/android_conversion.hpp @@ -68,8 +68,7 @@ inline optional<float> toNumber(const mbgl::android::Value& value) { inline optional<double> toDouble(const mbgl::android::Value& value) { if (value.isNumber()) { - auto num = value.toDouble(); - return num; + return value.toDouble(); } else { return {}; } diff --git a/platform/default/mbgl/storage/offline_download.cpp b/platform/default/mbgl/storage/offline_download.cpp index 980561e43a..7f0001f64b 100644 --- a/platform/default/mbgl/storage/offline_download.cpp +++ b/platform/default/mbgl/storage/offline_download.cpp @@ -121,7 +121,7 @@ OfflineRegionStatus OfflineDownload::getStatus() const { case SourceType::Image: { const auto& imageSource = *source->as<ImageSource>(); - if (!imageSource.getURL().empty()) { + if (imageSource.getURL()) { result.requiredResourceCount += 1; } break; @@ -205,9 +205,9 @@ void OfflineDownload::activateDownload() { case SourceType::Image: { const auto& imageSource = *source->as<ImageSource>(); - std::string imageUrl = imageSource.getURL(); - if (!imageUrl.empty()) { - queueResource(Resource::image(imageUrl)); + auto imageUrl = imageSource.getURL(); + if (imageUrl && !imageUrl->empty()) { + queueResource(Resource::image(*imageUrl)); } break; } |