diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-08-30 15:56:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-30 15:56:28 -0700 |
| commit | 4feab7531dfdfe26e023670c3c4493a2bee45788 (patch) | |
| tree | cda6a8dbdedaaf681f6dd633e61f8043e61e7ad4 | |
| parent | 3a5c836282033c1fb0eea8cc2d1883540ab50efa (diff) | |
| parent | c09c5f0328a28ccfe9a0a9b37d028e91a94ded94 (diff) | |
| download | android_packages_apps_Snap-4feab7531dfdfe26e023670c3c4493a2bee45788.tar.gz android_packages_apps_Snap-4feab7531dfdfe26e023670c3c4493a2bee45788.tar.bz2 android_packages_apps_Snap-4feab7531dfdfe26e023670c3c4493a2bee45788.zip | |
am c09c5f03: Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad
* commit 'c09c5f0328a28ccfe9a0a9b37d028e91a94ded94':
Fix of memory issues with bitmaps in filmstrip.
| -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(); |