diff options
| author | Owen Lin <owenlin@google.com> | 2011-08-22 22:46:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-22 22:46:19 -0700 |
| commit | 31c7b13bf1c93f7eabd658e55c545eccd9d347a9 (patch) | |
| tree | d88eeb4ea70fa4d88af6524d41c0c7e39e956eec /src/com/android/gallery3d/ui | |
| parent | e979160a10fcfc9d580b6bbacc11af6ee40ef32a (diff) | |
| parent | b225416022949bbc265ead6832ef92e9e08aa3fe (diff) | |
| download | android_packages_apps_Snap-31c7b13bf1c93f7eabd658e55c545eccd9d347a9.tar.gz android_packages_apps_Snap-31c7b13bf1c93f7eabd658e55c545eccd9d347a9.tar.bz2 android_packages_apps_Snap-31c7b13bf1c93f7eabd658e55c545eccd9d347a9.zip | |
Merge "Fix unknown type for GL issue."
Diffstat (limited to 'src/com/android/gallery3d/ui')
| -rw-r--r-- | src/com/android/gallery3d/ui/TileImageView.java | 5 |
1 files changed, 3 insertions, 2 deletions
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); |