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/MapboxGLAndroidSDK/src/main | |
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/MapboxGLAndroidSDK/src/main')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java index 5904c0d69e..a4e98532d1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java @@ -1,8 +1,10 @@ package com.mapbox.mapboxsdk.text; import android.graphics.Canvas; +import android.graphics.Color; import android.graphics.Paint; import android.graphics.Bitmap; +import android.graphics.PorterDuff; import android.graphics.Typeface; import android.support.annotation.Keep; import android.support.annotation.WorkerThread; @@ -12,6 +14,25 @@ import android.support.annotation.WorkerThread; * by the portable local_glyph_rasterizer.hpp */ public class LocalGlyphRasterizer { + private final Bitmap bitmap; + private final Paint paint; + private final Canvas canvas; + + LocalGlyphRasterizer() { + /* + 35x35px dimensions are hardwired to match local_glyph_rasterizer.cpp + These dimensions are large enough to draw a 24 point character in the middle + of the bitmap (y: 20) with some buffer around the edge + */ + bitmap = Bitmap.createBitmap(35, 35, Bitmap.Config.ARGB_8888); + + paint = new Paint(); + paint.setAntiAlias(true); + paint.setTextSize(24); + + canvas = new Canvas(); + canvas.setBitmap(bitmap); + } /*** * Uses Android-native drawing code to rasterize a single glyph @@ -26,23 +47,10 @@ public class LocalGlyphRasterizer { */ @WorkerThread @Keep - protected static Bitmap drawGlyphBitmap(String fontFamily, boolean bold, char glyphID) { - /* - 35x35px dimensions are hardwired to match local_glyph_rasterizer.cpp - These dimensions are large enough to draw a 24 point character in the middle - of the bitmap (y: 20) with some buffer around the edge - */ - Bitmap bitmap = Bitmap.createBitmap(35, 35, Bitmap.Config.ARGB_8888); - - Paint paint = new Paint(); - paint.setAntiAlias(true); - paint.setTextSize(24); + protected Bitmap drawGlyphBitmap(String fontFamily, boolean bold, char glyphID) { paint.setTypeface(Typeface.create(fontFamily, bold ? Typeface.BOLD : Typeface.NORMAL)); - - Canvas canvas = new Canvas(); - canvas.setBitmap(bitmap); + canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR); canvas.drawText(String.valueOf(glyphID), 0, 20, paint); - return bitmap; } } |