diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-12-09 15:09:42 +0100 |
|---|---|---|
| committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2020-01-15 15:02:11 +0200 |
| commit | 62b0f4cde289e5918c41d5b69b0a03baa6821862 (patch) | |
| tree | 2042319da9abd756564dcbba7812d4868a177800 /platform | |
| parent | 4b171cccf1c4012f8962b022f86c4ac8d73f09df (diff) | |
| download | qtlocation-mapboxgl-62b0f4cde289e5918c41d5b69b0a03baa6821862.tar.gz | |
[core] Add stretches and content to style::Image
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/src/map/image.cpp | 2 | ||||
| -rw-r--r-- | platform/android/src/native_map_view.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/src/map/image.cpp b/platform/android/src/map/image.cpp index a91cc938ed..10c32d2577 100644 --- a/platform/android/src/map/image.cpp +++ b/platform/android/src/map/image.cpp @@ -26,7 +26,7 @@ mbgl::style::Image Image::getImage(jni::JNIEnv& env, const jni::Object<Image>& i mbgl::PremultipliedImage premultipliedImage({ static_cast<uint32_t>(width), static_cast<uint32_t>(height) }); if (premultipliedImage.bytes() != uint32_t(size)) { - throw mbgl::util::SpriteImageException("Sprite image pixel count mismatch"); + throw mbgl::util::StyleImageException("Image pixel count mismatch"); } jni::GetArrayRegion(env, *pixels, 0, size, reinterpret_cast<jbyte*>(premultipliedImage.data.get())); diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index d7351c7677..920779c18f 100644 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -763,7 +763,7 @@ void NativeMapView::addAnnotationIcon(JNIEnv& env, const jni::String& symbol, ji mbgl::PremultipliedImage premultipliedImage({ static_cast<uint32_t>(w), static_cast<uint32_t>(h) }); if (premultipliedImage.bytes() != uint32_t(size)) { - throw mbgl::util::SpriteImageException("Sprite image pixel count mismatch"); + throw mbgl::util::StyleImageException("Annotation icon image pixel count mismatch"); } jni::GetArrayRegion(env, *jpixels, 0, size, reinterpret_cast<jbyte*>(premultipliedImage.data.get())); |