diff options
| author | John Hoford <hoford@google.com> | 2013-11-01 17:32:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-01 17:32:32 -0700 |
| commit | d5dbfe7b0336ef2349dd2ca321ae4cc51cb8b1ff (patch) | |
| tree | ec32ae55383409c847901557b731cf29ae2d2fd9 /src | |
| parent | c4354f79a4c0454f26d9c471fb1b5a7bbc0a975f (diff) | |
| parent | d6644d6047b4257c5d01848a45428651f0ae5401 (diff) | |
| download | android_packages_apps_Gallery2-d5dbfe7b0336ef2349dd2ca321ae4cc51cb8b1ff.tar.gz android_packages_apps_Gallery2-d5dbfe7b0336ef2349dd2ca321ae4cc51cb8b1ff.tar.bz2 android_packages_apps_Gallery2-d5dbfe7b0336ef2349dd2ca321ae4cc51cb8b1ff.zip | |
am d6644d60: am c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad
* commit 'd6644d6047b4257c5d01848a45428651f0ae5401':
fix Gallery crash using crop
Diffstat (limited to 'src')
| -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; |