Added suggested chchchanges

Author: eveliotc

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

@@ -234,22 +234,20 @@ 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
+   * based in given {@link com.squareup.picasso.Request},
+   * only instantiating them if needed.
    */
   static BitmapFactory.Options createBitmapOptions(Request data) {
     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;
-    }
+    BitmapFactory.Options options = null;
+    if (justBounds || hasConfig) {
+      options = new BitmapFactory.Options();
+      options.inJustDecodeBounds = justBounds;
 
-    if (hasConfig) {
-      options.inPreferredConfig = data.config;
+      if (hasConfig) {
+        options.inPreferredConfig = data.config;
+      }
     }
     return options;
   }

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

@@ -352,18 +352,22 @@ public class BitmapHunterTest {
     assertThat(requiresInSampleSize(justBounds)).isTrue();
   }
 
-  @Test public void bitmapOptionsCreation() {
+  @Test public void nullBitmapOptionsIfNoResizing() {
     // 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();
+  }
 
+  @Test public void inJustDecodeBoundsIfResizing() {
     // 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();
+  }
 
+  @Test public void createWithConfigAndNotInJustDecodeBounds() {
     // 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);