diff options
author | Kiyong Jung <autoexec.bat@navercorp.com> | 2018-07-19 12:08:40 +0900 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2018-07-27 11:24:26 +0200 |
commit | 37bbed5b9c3f95dc1e596b885702808202e4193c (patch) | |
tree | 5d0527a5c6fbc3e99eabff8fd3998190ae187493 /platform/android/src/text/local_glyph_rasterizer.cpp | |
parent | 94ad8e2ff8928bec316dfcc9790db7b522673d3e (diff) | |
download | qtlocation-mapboxgl-37bbed5b9c3f95dc1e596b885702808202e4193c.tar.gz |
[android] Reuse Bitmap, Paint & Canvas instances in LocalGlyphRasterizer
- Make LocalGlyphRasterizer.drawGlyphBitmap() non-static
- Store and reuse Bitmap, Paint & Canvas instances
Diffstat (limited to 'platform/android/src/text/local_glyph_rasterizer.cpp')
-rw-r--r-- | platform/android/src/text/local_glyph_rasterizer.cpp | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/platform/android/src/text/local_glyph_rasterizer.cpp b/platform/android/src/text/local_glyph_rasterizer.cpp index d232058d15..3dc1eb275a 100644 --- a/platform/android/src/text/local_glyph_rasterizer.cpp +++ b/platform/android/src/text/local_glyph_rasterizer.cpp @@ -33,19 +33,27 @@ namespace mbgl { namespace android { +LocalGlyphRasterizer::LocalGlyphRasterizer() { + UniqueEnv env { AttachEnv() }; + + static auto constructor = javaClass.GetConstructor(*env); + + javaObject = javaClass.New(*env, constructor).NewGlobalRef(*env); +} + PremultipliedImage LocalGlyphRasterizer::drawGlyphBitmap(const std::string& fontFamily, const bool bold, const GlyphID glyphID) { UniqueEnv env { AttachEnv() }; using Signature = jni::Object<Bitmap>(jni::String, jni::jboolean, jni::jchar); - auto method = javaClass.GetStaticMethod<Signature>(*env, "drawGlyphBitmap"); + static auto method = javaClass.GetMethod<Signature>(*env, "drawGlyphBitmap"); jni::String jniFontFamily = jni::Make<jni::String>(*env, fontFamily); - auto javaBitmap = javaClass.Call(*env, - method, - jniFontFamily, - static_cast<jni::jboolean>(bold), - static_cast<jni::jchar>(glyphID)); + auto javaBitmap = javaObject->Call(*env, + method, + jniFontFamily, + static_cast<jni::jboolean>(bold), + static_cast<jni::jchar>(glyphID)); jni::DeleteLocalRef(*env, jniFontFamily); PremultipliedImage result = Bitmap::GetImage(*env, javaBitmap); @@ -77,13 +85,15 @@ public: std::string lowercaseFont = platform::lowercase(font); if (lowercaseFont.find("bold") != std::string::npos) { bold = true; + break; } } - return android::LocalGlyphRasterizer::drawGlyphBitmap(*fontFamily, bold, glyphID); + return androidLocalGlyphRasterizer.drawGlyphBitmap(*fontFamily, bold, glyphID); } private: optional<std::string> fontFamily; + android::LocalGlyphRasterizer androidLocalGlyphRasterizer; }; LocalGlyphRasterizer::LocalGlyphRasterizer(const optional<std::string> fontFamily) |