diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2018-08-17 13:43:07 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-09-07 09:44:12 -0700 |
commit | 53c3c327f0ebea276d977f58a59cdb9449165518 (patch) | |
tree | 1315a80a1c24f24dd1cbd4e00cf85083be16ce45 /platform/android/src/bitmap.hpp | |
parent | 6806ba5b52129050c0944bd7c8b1fe285baeeddc (diff) | |
download | qtlocation-mapboxgl-53c3c327f0ebea276d977f58a59cdb9449165518.tar.gz |
[android] Upgrade to latest jni.hpp
Diffstat (limited to 'platform/android/src/bitmap.hpp')
-rw-r--r-- | platform/android/src/bitmap.hpp | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/platform/android/src/bitmap.hpp b/platform/android/src/bitmap.hpp index c4e41db1e0..2266bc0e67 100644 --- a/platform/android/src/bitmap.hpp +++ b/platform/android/src/bitmap.hpp @@ -11,10 +11,7 @@ class Bitmap { public: class Config { public: - static constexpr auto Name() { - return "android/graphics/Bitmap$Config"; - }; - static void registerNative(jni::JNIEnv&); + static constexpr auto Name() { return "android/graphics/Bitmap$Config"; }; enum Value { ALPHA_8, @@ -24,18 +21,14 @@ public: }; static jni::Object<Config> Create(jni::JNIEnv&, Value); - - private: - static jni::Class<Config> _class; }; - static constexpr auto Name() { - return "android/graphics/Bitmap"; - }; + static constexpr auto Name() { return "android/graphics/Bitmap"; }; static void registerNative(jni::JNIEnv&); static jni::Object<Bitmap> CreateBitmap(jni::JNIEnv&, jni::jint width, jni::jint height, jni::Object<Config>); + static jni::Object<Bitmap> CreateBitmap(jni::JNIEnv& env, jni::jint width, jni::jint height, Config::Value config) { return CreateBitmap(env, width, height, Config::Create(env, config)); @@ -44,9 +37,6 @@ public: static PremultipliedImage GetImage(jni::JNIEnv&, jni::Object<Bitmap>); static jni::Object<Bitmap> CreateBitmap(jni::JNIEnv&, const PremultipliedImage&); static jni::Object<Bitmap> Copy(jni::JNIEnv&, jni::Object<Bitmap>); - -private: - static jni::Class<Bitmap> _class; }; } // namespace android |