diff options
| author | John Hoford <hoford@google.com> | 2013-11-04 21:53:39 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-04 21:53:39 -0800 |
| commit | 6337f5ec25499c55a8aa14524b6da8395d5db768 (patch) | |
| tree | fd781c6f3f5f313eee3c00626d42c37c125b7371 /src/com/android/gallery3d | |
| parent | 47e8a7bf8351d4e7e81127015410b2a37f0f335a (diff) | |
| parent | d5dbfe7b0336ef2349dd2ca321ae4cc51cb8b1ff (diff) | |
| download | android_packages_apps_Gallery2-6337f5ec25499c55a8aa14524b6da8395d5db768.tar.gz android_packages_apps_Gallery2-6337f5ec25499c55a8aa14524b6da8395d5db768.tar.bz2 android_packages_apps_Gallery2-6337f5ec25499c55a8aa14524b6da8395d5db768.zip | |
am d5dbfe7b: am d6644d60: am c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad
* commit 'd5dbfe7b0336ef2349dd2ca321ae4cc51cb8b1ff':
fix Gallery crash using crop
Diffstat (limited to 'src/com/android/gallery3d')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java index 4b0399128..4e53f8247 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java @@ -265,6 +265,7 @@ public class ImageCrop extends ImageShow { mImageBounds.set(0, 0, bitmap.getWidth(), bitmap.getHeight()); // If display matrix doesn't exist, create it and its dependencies if (mDisplayCropMatrix == null || mDisplayMatrix == null || mDisplayMatrixInverse == null) { + mCropObj.unsetAspectRatio(); mDisplayMatrix = GeometryMathUtils.getFullGeometryToScreenMatrix(mGeometry, bitmap.getWidth(), bitmap.getHeight(), canvas.getWidth(), canvas.getHeight()); float straighten = mGeometry.straighten; |