diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-08-30 00:47:49 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-30 00:47:49 +0000 |
commit | c09c5f0328a28ccfe9a0a9b37d028e91a94ded94 (patch) | |
tree | ff51a25a014830b155fd7c40def67ea5af1f44e1 /src/com/android/camera/data | |
parent | f3d3a5c63bd0d88882f0180ac79186c03c644c70 (diff) | |
parent | 7f47e6ced2f9305296eadd6ad8647ff92890890f (diff) | |
download | android_packages_apps_Snap-c09c5f0328a28ccfe9a0a9b37d028e91a94ded94.tar.gz android_packages_apps_Snap-c09c5f0328a28ccfe9a0a9b37d028e91a94ded94.tar.bz2 android_packages_apps_Snap-c09c5f0328a28ccfe9a0a9b37d028e91a94ded94.zip |
Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android/camera/data')
-rw-r--r-- | src/com/android/camera/data/LocalMediaData.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java index 071a9ca52..fef141f55 100644 --- a/src/com/android/camera/data/LocalMediaData.java +++ b/src/com/android/camera/data/LocalMediaData.java @@ -472,7 +472,7 @@ public abstract class LocalMediaData implements LocalData { if (mWidth > mDecodeWidth || mHeight > mDecodeHeight) { int heightRatio = Math.round((float) mHeight / (float) mDecodeHeight); int widthRatio = Math.round((float) mWidth / (float) mDecodeWidth); - sampleSize = heightRatio < widthRatio ? heightRatio : widthRatio; + sampleSize = Math.max(heightRatio, widthRatio); } BitmapFactory.Options opts = new BitmapFactory.Options(); |