From b225416022949bbc265ead6832ef92e9e08aa3fe Mon Sep 17 00:00:00 2001
From: Owen Lin <owenlin@google.com>
Date: Fri, 19 Aug 2011 16:26:29 +0800
Subject: Fix unknown type for GL issue.

fix: 5171449

Change-Id: Ib62e3237584144e94be6be773c292002bea5d21c
---
 src/com/android/gallery3d/ui/TileImageView.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/com/android/gallery3d/ui')

diff --git a/src/com/android/gallery3d/ui/TileImageView.java b/src/com/android/gallery3d/ui/TileImageView.java
index cf0685191..2cecedd33 100644
--- a/src/com/android/gallery3d/ui/TileImageView.java
+++ b/src/com/android/gallery3d/ui/TileImageView.java
@@ -18,6 +18,7 @@ package com.android.gallery3d.ui;
 
 import com.android.gallery3d.app.GalleryContext;
 import com.android.gallery3d.common.Utils;
+import com.android.gallery3d.data.DecodeUtils;
 import com.android.gallery3d.util.Future;
 import com.android.gallery3d.util.ThreadPool;
 import com.android.gallery3d.util.ThreadPool.CancelListener;
@@ -600,8 +601,8 @@ public class TileImageView extends GLView {
             int tileLength = (TILE_SIZE + 2 * TILE_BORDER);
             int borderLength = TILE_BORDER << mTileLevel;
             try {
-                mDecodedTile = mModel.getTile(
-                        mTileLevel, mX - borderLength, mY - borderLength, tileLength);
+                mDecodedTile = DecodeUtils.ensureGLCompatibleBitmap(mModel.getTile(
+                        mTileLevel, mX - borderLength, mY - borderLength, tileLength));
                 return mDecodedTile != null;
             } catch (Throwable t) {
                 Log.w(TAG, "fail to decode tile", t);
-- 
cgit v1.2.3