diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-01-01 19:11:54 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-01-01 19:11:54 -0800 |
| commit | 607dbbce47ceb7a63bd49ddb6af0c2026c4b1d9a (patch) | |
| tree | 5f7740c5a5c5c8257be92ff5fd210971fca0a854 | |
| parent | f20fb90f55fc069e08e0e4526e9e1c9b34038f24 (diff) | |
| parent | 4e4eea7b124595dea584db27c391bbced7d886cc (diff) | |
| download | android_packages_apps_Gallery2-607dbbce47ceb7a63bd49ddb6af0c2026c4b1d9a.tar.gz android_packages_apps_Gallery2-607dbbce47ceb7a63bd49ddb6af0c2026c4b1d9a.tar.bz2 android_packages_apps_Gallery2-607dbbce47ceb7a63bd49ddb6af0c2026c4b1d9a.zip | |
Merge "fix NullPointerException in applyOriginalAspect" into android-snapdragonGallery.lnx.1.0
| -rwxr-xr-x[-rw-r--r--] | src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java index baabbadb9..8e3708181 100644..100755 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java @@ -165,6 +165,9 @@ public class ImageCrop extends ImageShow { } public void applyOriginalAspect() { + if(mCropObj == null) { + return; + } RectF outer = mCropObj.getOuterBounds(); float w = outer.width(); float h = outer.height(); |