Create Options only when needed

Create `BitmapFactory.Options` only when resizing or giving a custom `Bitmap.Config`
`createBitmapOptions` will translate given `Request` to `BitmapFactory.Options`
Introduce `requiresInSampleSize` to determinate if computation of sample size is required

Author: eveliotc

picasso/src/main/java/com/squareup/picasso/AssetBitmapHunter.java

@@ -33,9 +33,8 @@ public AssetBitmapHunter(Context context, Picasso picasso, Dispatcher dispatcher
   }
 
   Bitmap decodeAsset(String filePath) throws IOException {
-    BitmapFactory.Options options = createBitmapOptions(data);
-    if (data.hasSize()) {
-      options.inJustDecodeBounds = true;
+    final BitmapFactory.Options options = createBitmapOptions(data);
+    if (requiresInSampleSize(options)) {
       InputStream is = null;
       try {
         is = assetManager.open(filePath);

picasso/src/main/java/com/squareup/picasso/BitmapHunter.java

@@ -232,14 +232,32 @@ static BitmapHunter forRequest(Context context, Picasso picasso, Dispatcher disp
     }
   }
 
+  /**
+   * Lazily create {@link android.graphics.BitmapFactory.Options}
+   *  based in given {@link com.squareup.picasso.Request}
+   *
+   * @param data
+   */
   static BitmapFactory.Options createBitmapOptions(Request data) {
-    BitmapFactory.Options options = new BitmapFactory.Options();
-    if (data.config != null) {
+    final boolean justBounds = data.hasSize();
+    final boolean hasConfig = data.config != null;
+    final boolean instantiate = hasConfig || justBounds;
+    // Only instantiate if we need it
+    final BitmapFactory.Options options = instantiate ? new BitmapFactory.Options() : null;
+    if (justBounds) {
+      options.inJustDecodeBounds = true;
+    }
+
+    if (hasConfig) {
       options.inPreferredConfig = data.config;
     }
     return options;
   }
 
+  static boolean requiresInSampleSize(BitmapFactory.Options options) {
+    return options != null && options.inJustDecodeBounds;
+  }
+
   static void calculateInSampleSize(int reqWidth, int reqHeight, BitmapFactory.Options options) {
     calculateInSampleSize(reqWidth, reqHeight, options.outWidth, options.outHeight, options);
   }

picasso/src/main/java/com/squareup/picasso/ContactsPhotoBitmapHunter.java

@@ -106,9 +106,8 @@ private Bitmap decodeStream(InputStream stream, Request data) throws IOException
     if (stream == null) {
       return null;
     }
-    BitmapFactory.Options options = createBitmapOptions(data);
-    if (data.hasSize()) {
-      options.inJustDecodeBounds = true;
+    final BitmapFactory.Options options = createBitmapOptions(data);
+    if (requiresInSampleSize(options)) {
       InputStream is = getInputStream();
       try {
         BitmapFactory.decodeStream(is, null, options);

picasso/src/main/java/com/squareup/picasso/ContentStreamBitmapHunter.java

@@ -44,9 +44,8 @@ class ContentStreamBitmapHunter extends BitmapHunter {
 
   protected Bitmap decodeContentStream(Request data) throws IOException {
     ContentResolver contentResolver = context.getContentResolver();
-    BitmapFactory.Options options = createBitmapOptions(data);
-    if (data.hasSize()) {
-      options.inJustDecodeBounds = true;
+    final BitmapFactory.Options options = createBitmapOptions(data);
+    if (requiresInSampleSize(options)) {
       InputStream is = null;
       try {
         is = contentResolver.openInputStream(data.uri);

picasso/src/main/java/com/squareup/picasso/NetworkBitmapHunter.java

@@ -81,25 +81,22 @@ private Bitmap decodeStream(InputStream stream, Request data) throws IOException
 
     long mark = markStream.savePosition(MARKER);
 
+    final BitmapFactory.Options options = createBitmapOptions(data);
+    final boolean calculateSize = requiresInSampleSize(options);
+
     boolean isWebPFile = Utils.isWebPFile(stream);
     markStream.reset(mark);
     // When decode WebP network stream, BitmapFactory throw JNI Exception and make app crash.
     // Decode byte array instead
     if (isWebPFile) {
       byte[] bytes = Utils.toByteArray(stream);
-      BitmapFactory.Options options = createBitmapOptions(data);
-      if (data.hasSize()) {
-        options.inJustDecodeBounds = true;
-
+      if (calculateSize) {
         BitmapFactory.decodeByteArray(bytes, 0, bytes.length, options);
         calculateInSampleSize(data.targetWidth, data.targetHeight, options);
       }
       return BitmapFactory.decodeByteArray(bytes, 0, bytes.length, options);
     } else {
-      BitmapFactory.Options options = createBitmapOptions(data);
-      if (data.hasSize()) {
-        options.inJustDecodeBounds = true;
-
+      if (calculateSize) {
         BitmapFactory.decodeStream(stream, null, options);
         calculateInSampleSize(data.targetWidth, data.targetHeight, options);
 

picasso/src/main/java/com/squareup/picasso/ResourceBitmapHunter.java

@@ -43,12 +43,11 @@ class ResourceBitmapHunter extends BitmapHunter {
   }
 
   private Bitmap decodeResource(Resources resources, int id, Request data) {
-    BitmapFactory.Options bitmapOptions = createBitmapOptions(data);
-    if (data.hasSize()) {
-      bitmapOptions.inJustDecodeBounds = true;
-      BitmapFactory.decodeResource(resources, id, bitmapOptions);
-      calculateInSampleSize(data.targetWidth, data.targetHeight, bitmapOptions);
+    final BitmapFactory.Options options = createBitmapOptions(data);
+    if (requiresInSampleSize(options)) {
+      BitmapFactory.decodeResource(resources, id, options);
+      calculateInSampleSize(data.targetWidth, data.targetHeight, options);
     }
-    return BitmapFactory.decodeResource(resources, id, bitmapOptions);
+    return BitmapFactory.decodeResource(resources, id, options);
   }
 }

picasso/src/test/java/com/squareup/picasso/BitmapHunterTest.java

@@ -17,11 +17,9 @@
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
 import android.net.Uri;
-import java.io.File;
-import java.io.IOException;
-import java.util.concurrent.FutureTask;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,9 +29,15 @@
 import org.robolectric.shadows.ShadowBitmap;
 import org.robolectric.shadows.ShadowMatrix;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.FutureTask;
+
 import static android.graphics.Bitmap.Config.ARGB_8888;
+import static android.graphics.Bitmap.Config.RGB_565;
 import static com.squareup.picasso.BitmapHunter.createBitmapOptions;
 import static com.squareup.picasso.BitmapHunter.forRequest;
+import static com.squareup.picasso.BitmapHunter.requiresInSampleSize;
 import static com.squareup.picasso.BitmapHunter.transformResult;
 import static com.squareup.picasso.Picasso.LoadedFrom.MEMORY;
 import static com.squareup.picasso.TestUtils.ASSET_KEY_1;
@@ -50,8 +54,8 @@
 import static com.squareup.picasso.TestUtils.RESOURCE_ID_1;
 import static com.squareup.picasso.TestUtils.RESOURCE_ID_KEY_1;
 import static com.squareup.picasso.TestUtils.RESOURCE_ID_URI;
-import static com.squareup.picasso.TestUtils.RESOURCE_TYPE_URI;
 import static com.squareup.picasso.TestUtils.RESOURCE_ID_URI_KEY;
+import static com.squareup.picasso.TestUtils.RESOURCE_TYPE_URI;
 import static com.squareup.picasso.TestUtils.RESOURCE_TYPE_URI_KEY;
 import static com.squareup.picasso.TestUtils.URI_1;
 import static com.squareup.picasso.TestUtils.URI_KEY_1;
@@ -339,6 +343,34 @@ public class BitmapHunterTest {
     }
   }
 
+  @Test public void requiresComputeInSampleSize() {
+    assertThat(requiresInSampleSize(null)).isFalse();
+    final BitmapFactory.Options defaultOptions = new BitmapFactory.Options();
+    assertThat(requiresInSampleSize(defaultOptions)).isFalse();
+    final BitmapFactory.Options justBounds = new BitmapFactory.Options();
+    justBounds.inJustDecodeBounds = true;
+    assertThat(requiresInSampleSize(justBounds)).isTrue();
+  }
+
+  @Test public void bitmapOptionsCreation() {
+    // No resize must return no bitmap options
+    final Request noResize = new Request.Builder(URI_1).build();
+    final BitmapFactory.Options noResizeOptions = createBitmapOptions(noResize);
+    assertThat(noResizeOptions).isNull();
+
+    // Resize must return bitmap options with inJustDecodeBounds = true
+    final Request requiresResize = new Request.Builder(URI_1).resize(20, 15).build();
+    final BitmapFactory.Options resizeOptions = createBitmapOptions(requiresResize);
+    assertThat(resizeOptions).isNotNull();
+    assertThat(resizeOptions.inJustDecodeBounds).isTrue();
+
+    // Given a config must return bitmap options and false inJustDecodeBounds
+    final Request config = new Request.Builder(URI_1).config(RGB_565).build();
+    final BitmapFactory.Options configOptions = createBitmapOptions(config);
+    assertThat(configOptions).isNotNull();
+    assertThat(configOptions.inJustDecodeBounds).isFalse();
+  }
+
   @Test public void centerCropTallTooSmall() throws Exception {
     Bitmap source = Bitmap.createBitmap(10, 20, ARGB_8888);
     Request data = new Request.Builder(URI_1).resize(40, 40).centerCrop().build();