diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-10-12 14:40:18 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-22 09:16:36 +0200 |
commit | a22ed80ea31838a8aafdcf095b3418db1a41002f (patch) | |
tree | 950f2b68b7b09ea6819b98b3e6af221f2327f3b9 /platform/android/src/bitmap.cpp | |
parent | 6bb1e977eafc61af39d47df083bb3de13205fae9 (diff) | |
download | qtlocation-mapboxgl-a22ed80ea31838a8aafdcf095b3418db1a41002f.tar.gz |
Refactor mbgl::Image class
- Used `thin template idiom` to avoid size bloating
- Exceptions free
- No public data members, other improvements
Diffstat (limited to 'platform/android/src/bitmap.cpp')
-rw-r--r-- | platform/android/src/bitmap.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/android/src/bitmap.cpp b/platform/android/src/bitmap.cpp index eb7c676b12..e664a2d406 100644 --- a/platform/android/src/bitmap.cpp +++ b/platform/android/src/bitmap.cpp @@ -89,7 +89,7 @@ PremultipliedImage Bitmap::GetImage(jni::JNIEnv& env, const jni::Object<Bitmap>& } jni::Local<jni::Object<Bitmap>> Bitmap::CreateBitmap(jni::JNIEnv& env, const PremultipliedImage& image) { - auto bitmap = CreateBitmap(env, image.size.width, image.size.height, Config::ARGB_8888); + auto bitmap = CreateBitmap(env, image.size().width, image.size().height, Config::ARGB_8888); AndroidBitmapInfo info; const int result = AndroidBitmap_getInfo(&env, jni::Unwrap(*bitmap), &info); @@ -98,15 +98,15 @@ jni::Local<jni::Object<Bitmap>> Bitmap::CreateBitmap(jni::JNIEnv& env, const Pre throw std::runtime_error("bitmap creation: couldn't get bitmap info"); } - assert(info.width == image.size.width); - assert(info.height == image.size.height); + assert(info.width == image.size().width); + assert(info.height == image.size().height); assert(info.format == ANDROID_BITMAP_FORMAT_RGBA_8888); PixelGuard guard(env, bitmap); // Copy the PremultipliedImage into the Android Bitmap - for (uint32_t y = 0; y < image.size.height; y++) { - auto begin = image.data.get() + y * image.stride(); + for (uint32_t y = 0; y < image.size().height; y++) { + auto begin = image.data() + y * image.stride(); std::copy(begin, begin + image.stride(), guard.get() + y * info.stride); } |