diff options
| -rw-r--r-- | gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java | 11 | ||||
| -rw-r--r-- | src/com/android/gallery3d/data/DecodeUtils.java | 8 |
2 files changed, 17 insertions, 2 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java b/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java index 060d7f32e..c34e89631 100644 --- a/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java +++ b/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java @@ -155,6 +155,17 @@ public class BitmapUtils { return resizeBitmapByScale(bitmap, scale, recycle); } + // Resize the bitmap if each side is >= targetSize * 2 + public static Bitmap resizeDownIfTooBig( + Bitmap bitmap, int targetSize, boolean recycle) { + int srcWidth = bitmap.getWidth(); + int srcHeight = bitmap.getHeight(); + float scale = Math.max( + (float) targetSize / srcWidth, (float) targetSize / srcHeight); + if (scale > 0.5f) return bitmap; + return resizeBitmapByScale(bitmap, scale, recycle); + } + // Crops a square from the center of the original image. public static Bitmap cropCenter(Bitmap bitmap, boolean recycle) { int width = bitmap.getWidth(); diff --git a/src/com/android/gallery3d/data/DecodeUtils.java b/src/com/android/gallery3d/data/DecodeUtils.java index afd5faa66..29b2aa738 100644 --- a/src/com/android/gallery3d/data/DecodeUtils.java +++ b/src/com/android/gallery3d/data/DecodeUtils.java @@ -102,8 +102,12 @@ public class DecodeUtils { options.inSampleSize = BitmapUtils.computeSampleSizeLarger( options.outWidth, options.outHeight, targetSize); options.inJustDecodeBounds = false; - return ensureGLCompatibleBitmap( - BitmapFactory.decodeFileDescriptor(fd, null, options)); + + Bitmap result = BitmapFactory.decodeFileDescriptor(fd, null, options); + // We need to resize down if the decoder does not support inSampleSize. + // (For example, GIF images.) + result = BitmapUtils.resizeDownIfTooBig(result, targetSize, true); + return ensureGLCompatibleBitmap(result); } /** |