Merge 607dbbce47ceb7a63bd49ddb6af0c2026c4b1d9a on remote branch

Change-Id: I36a7312273d395341bc84900f39493f3f4f2f36e

2 files changed, 6 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 5c289ce02..bf33b2225 100755
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -1481,6 +1481,9 @@ DialogInterface.OnDismissListener, PopupMenu.OnDismissListener{
         }
         if (TrueScannerActs.SERIALIZATION_NAME.equals(representation.getSerializationName())) {
             Bitmap b = MasterImage.getImage().getOriginalBitmapHighres();
+            if (b == null) {
+                return;
+            }
             int w = b.getWidth();
             int h = b.getHeight();
             if (w < h) {
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();