very important fix: When reusing a bitmap. Must clear it first, other…

…wise we might end up drawing the wrong tile
brgr · Jun 29, 2014 · 6362dbd · 6362dbd
1 parent 96ef3da
commit 6362dbd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/MapboxAndroidSDK/src/main/java/uk/co/senab/bitmapcache/BitmapMemoryLruCache.java b/MapboxAndroidSDK/src/main/java/uk/co/senab/bitmapcache/BitmapMemoryLruCache.java
@@ -16,6 +16,7 @@
 package uk.co.senab.bitmapcache;
 
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.support.v4.util.LruCache;
 
 import java.lang.ref.SoftReference;
@@ -86,6 +87,8 @@ public Bitmap getBitmapFromRemoved(final int width, final int height) {
                 if (canUseForInBitmap(value)) {
                     if (canUseForInBitmapForSize(value, width, height) && !value.isBeingDisplayed() && !value.isReferencedByCache()) {
                         result = value.getBitmap();
+                        SDK12.setHasAlpha(result, true);
+                        result.eraseColor(Color.TRANSPARENT);
                         value.setReused();
                         it.remove();
                         break;
@@ -122,8 +125,7 @@ void trimMemory() {
                 remove(entry.getKey());
             }
         }
-
-        if (mRemovedEntries!=null) {
+        if (mRemovedEntries != null) {
             synchronized (mRemovedEntries) {
                 mRemovedEntries.clear();
             }

diff --git a/MapboxAndroidSDK/src/main/java/uk/co/senab/bitmapcache/SDK12.java b/MapboxAndroidSDK/src/main/java/uk/co/senab/bitmapcache/SDK12.java
@@ -0,0 +1,13 @@
+package uk.co.senab.bitmapcache;
+
+
+import android.annotation.TargetApi;
+import android.graphics.Bitmap;
+import android.os.Build;
+
+@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
+public class SDK12 {
+    static void setHasAlpha(Bitmap bitmap, final boolean hasAlpha) {
+        bitmap.setHasAlpha(hasAlpha);
+    }
+}