From d8a549bb56fdc4ada2073ab55b830aeead4eaadd Mon Sep 17 00:00:00 2001
From: Jamie McDonald <jdamcd@gmail.com>
Date: Fri, 20 Nov 2015 15:22:41 +0100
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20attempt=20to=20scale=20an=20ima?=
 =?UTF-8?q?ge=20that=20could=20not=20be=20decoded?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/soundcloud/android/crop/CropImageActivity.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java b/lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java
index d86355d..97a0466 100644
--- a/lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java
+++ b/lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java
@@ -344,7 +344,7 @@ public class CropImageActivity extends MonitoredActivity {
 
             try {
                 croppedImage = decoder.decodeRegion(rect, new BitmapFactory.Options());
-                if (rect.width() > outWidth || rect.height() > outHeight) {
+                if (croppedImage != null && (rect.width() > outWidth || rect.height() > outHeight)) {
                     Matrix matrix = new Matrix();
                     matrix.postScale((float) outWidth / rect.width(), (float) outHeight / rect.height());
                     croppedImage = Bitmap.createBitmap(croppedImage, 0, 0, croppedImage.getWidth(), croppedImage.getHeight(), matrix, true);