From 3c2e3e6b997bd4c9d0d1d82811bb86913aa38476 Mon Sep 17 00:00:00 2001
From: Jamie McDonald <jdamcd@gmail.com>
Date: Fri, 13 Feb 2015 14:06:11 +0100
Subject: [PATCH] Very slightly less weird interface to crop methods

---
 .../soundcloud/android/crop/CropImageActivity.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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 03b9345..b034f65 100644
--- a/lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java
+++ b/lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java
@@ -283,7 +283,7 @@ public class CropImageActivity extends MonitoredActivity {
         }
 
         if (IN_MEMORY_CROP && rotateBitmap != null) {
-            croppedImage = inMemoryCrop(rotateBitmap, croppedImage, r, width, height, outWidth, outHeight);
+            croppedImage = inMemoryCrop(rotateBitmap, r, width, height, outWidth, outHeight);
             if (croppedImage != null) {
                 imageView.setImageBitmapResetBase(croppedImage, true);
                 imageView.center(true, true);
@@ -291,7 +291,7 @@ public class CropImageActivity extends MonitoredActivity {
             }
         } else {
             try {
-                croppedImage = decodeRegionCrop(croppedImage, r);
+                croppedImage = decodeRegionCrop(r);
             } catch (IllegalArgumentException e) {
                 setResultException(e);
                 finish();
@@ -323,11 +323,12 @@ public class CropImageActivity extends MonitoredActivity {
     }
 
     @TargetApi(10)
-    private Bitmap decodeRegionCrop(Bitmap croppedImage, Rect rect) {
+    private Bitmap decodeRegionCrop(Rect rect) {
         // Release memory now
         clearImageView();
 
         InputStream is = null;
+        Bitmap croppedImage = null;
         try {
             is = getContentResolver().openInputStream(sourceUri);
             BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is, false);
@@ -367,12 +368,12 @@ public class CropImageActivity extends MonitoredActivity {
         return croppedImage;
     }
 
-    private Bitmap inMemoryCrop(RotateBitmap rotateBitmap, Bitmap croppedImage, Rect r,
-                                int width, int height, int outWidth, int outHeight) {
+    private Bitmap inMemoryCrop(RotateBitmap rotateBitmap, Rect r, int width, int height, int outWidth, int outHeight) {
         // In-memory crop means potential OOM errors,
         // but we have no choice as we can't selectively decode a bitmap with this API level
         System.gc();
 
+        Bitmap croppedImage = null;
         try {
             croppedImage = Bitmap.createBitmap(outWidth, outHeight, Bitmap.Config.RGB_565);