diff options
| author | John Hoford <hoford@google.com> | 2013-10-31 16:17:01 -0700 |
|---|---|---|
| committer | John Hoford <hoford@google.com> | 2013-11-01 09:56:36 -0700 |
| commit | 4a5fd0627e5c3f3094127dfbd782cd96080482d4 (patch) | |
| tree | c1aac4c04e8aa1068ff3101f60fd714683f620bb /src/com | |
| parent | ebbcc3944adcc01846128d1bdacc7c8b1c8cdb35 (diff) | |
| download | android_packages_apps_Gallery2-4a5fd0627e5c3f3094127dfbd782cd96080482d4.tar.gz android_packages_apps_Gallery2-4a5fd0627e5c3f3094127dfbd782cd96080482d4.tar.bz2 android_packages_apps_Gallery2-4a5fd0627e5c3f3094127dfbd782cd96080482d4.zip | |
fix Gallery crash using crop
bug:11347083
Change-Id: Ic5417d12e0b1cee181ddad8d581eddc6aeb8a5b8
Diffstat (limited to 'src/com')
| -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; |