diff options
| author | John Hoford <hoford@google.com> | 2013-11-01 17:28:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-01 17:28:10 -0700 |
| commit | d6644d6047b4257c5d01848a45428651f0ae5401 (patch) | |
| tree | a3bcf78661f5c1e3b716d94434477d0886b992b1 | |
| parent | 164de4d861636730b59ac3e7d64fdd2af36ac089 (diff) | |
| parent | c0c6f058d464be3e4d6925239bcabc5b56fbce80 (diff) | |
| download | android_packages_apps_Gallery2-d6644d6047b4257c5d01848a45428651f0ae5401.tar.gz android_packages_apps_Gallery2-d6644d6047b4257c5d01848a45428651f0ae5401.tar.bz2 android_packages_apps_Gallery2-d6644d6047b4257c5d01848a45428651f0ae5401.zip | |
am c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad
* commit 'c0c6f058d464be3e4d6925239bcabc5b56fbce80':
fix Gallery crash using crop
| -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; |