Added possibility to specify Bitmap.Config for image decoding

Author: nsk-mironov

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 = null;
+    BitmapFactory.Options options = createBitmapOptions(data);
     if (data.hasSize()) {
-      options = new BitmapFactory.Options();
       options.inJustDecodeBounds = true;
       InputStream is = null;
       try {

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

@@ -216,6 +216,14 @@ static BitmapHunter forRequest(Context context, Picasso picasso, Dispatcher disp
     }
   }
 
+  static BitmapFactory.Options createBitmapOptions(Request data) {
+    BitmapFactory.Options options = new BitmapFactory.Options();
+    if (data.config != null) {
+      options.inPreferredConfig = data.config;
+    }
+    return options;
+  }
+
   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 = null;
+    BitmapFactory.Options options = createBitmapOptions(data);
     if (data.hasSize()) {
-      options = new BitmapFactory.Options();
       options.inJustDecodeBounds = true;
       InputStream is = getInputStream();
       try {

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 = null;
+    BitmapFactory.Options options = createBitmapOptions(data);
     if (data.hasSize()) {
-      options = new BitmapFactory.Options();
       options.inJustDecodeBounds = true;
       InputStream is = null;
       try {

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

@@ -55,7 +55,7 @@ class MediaStoreBitmapHunter extends ContentStreamBitmapHunter {
 
       long id = parseId(data.uri);
 
-      BitmapFactory.Options options = new BitmapFactory.Options();
+      BitmapFactory.Options options = createBitmapOptions(data);
       options.inJustDecodeBounds = true;
 
       calculateInSampleSize(data.targetWidth, data.targetHeight, picassoKind.width,

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

@@ -87,19 +87,17 @@ private Bitmap decodeStream(InputStream stream, Request data) throws IOException
     // Decode byte array instead
     if (isWebPFile) {
       byte[] bytes = Utils.toByteArray(stream);
-      BitmapFactory.Options options = null;
+      BitmapFactory.Options options = createBitmapOptions(data);
       if (data.hasSize()) {
-        options = new BitmapFactory.Options();
         options.inJustDecodeBounds = true;
 
         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 = null;
+      BitmapFactory.Options options = createBitmapOptions(data);
       if (data.hasSize()) {
-        options = new BitmapFactory.Options();
         options.inJustDecodeBounds = true;
 
         BitmapFactory.decodeStream(stream, null, options);

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

@@ -15,6 +15,7 @@
  */
 package com.squareup.picasso;
 
+import android.graphics.Bitmap;
 import android.net.Uri;
 import java.util.ArrayList;
 import java.util.List;
@@ -61,10 +62,12 @@ public final class Request {
   public final float rotationPivotY;
   /** Whether or not {@link #rotationPivotX} and {@link #rotationPivotY} are set. */
   public final boolean hasRotationPivot;
+  /** Target image config for decoding. */
+  public final Bitmap.Config config;
 
   private Request(Uri uri, int resourceId, List<Transformation> transformations, int targetWidth,
       int targetHeight, boolean centerCrop, boolean centerInside, float rotationDegrees,
-      float rotationPivotX, float rotationPivotY, boolean hasRotationPivot) {
+      float rotationPivotX, float rotationPivotY, boolean hasRotationPivot, Bitmap.Config config) {
     this.uri = uri;
     this.resourceId = resourceId;
     if (transformations == null) {
@@ -80,6 +83,7 @@ private Request(Uri uri, int resourceId, List<Transformation> transformations, i
     this.rotationPivotX = rotationPivotX;
     this.rotationPivotY = rotationPivotY;
     this.hasRotationPivot = hasRotationPivot;
+    this.config = config;
   }
 
   String getName() {
@@ -122,6 +126,7 @@ public static final class Builder {
     private float rotationPivotY;
     private boolean hasRotationPivot;
     private List<Transformation> transformations;
+    private Bitmap.Config config;
 
     /** Start building a request using the specified {@link Uri}. */
     public Builder(Uri uri) {
@@ -152,6 +157,7 @@ private Builder(Request request) {
       if (request.transformations != null) {
         transformations = new ArrayList<Transformation>(request.transformations);
       }
+      config = request.config;
     }
 
     boolean hasImage() {
@@ -273,6 +279,12 @@ public Builder clearRotation() {
       return this;
     }
 
+    /** Decode the image using the specified config. */
+    public Builder config(Bitmap.Config config) {
+      this.config = config;
+      return this;
+    }
+
     /**
      * Add a custom transformation to be applied to the image.
      * <p/>
@@ -301,7 +313,7 @@ public Request build() {
         throw new IllegalStateException("Center inside requires calling resize.");
       }
       return new Request(uri, resourceId, transformations, targetWidth, targetHeight, centerCrop,
-          centerInside, rotationDegrees, rotationPivotX, rotationPivotY, hasRotationPivot);
+          centerInside, rotationDegrees, rotationPivotX, rotationPivotY, hasRotationPivot, config);
     }
   }
 }

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

@@ -20,9 +20,10 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.widget.ImageView;
-import java.io.IOException;
 import org.jetbrains.annotations.TestOnly;
 
+import java.io.IOException;
+
 import static com.squareup.picasso.BitmapHunter.forRequest;
 import static com.squareup.picasso.Picasso.LoadedFrom.MEMORY;
 import static com.squareup.picasso.Utils.checkNotMain;
@@ -174,6 +175,12 @@ public RequestCreator rotate(float degrees, float pivotX, float pivotY) {
     return this;
   }
 
+  /** Decode the image using the specified config. */
+  public RequestCreator config(Bitmap.Config config) {
+    data.config(config);
+    return this;
+  }
+
   /**
    * Add a custom transformation to be applied to the image.
    * <p/>

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

@@ -43,9 +43,8 @@ class ResourceBitmapHunter extends BitmapHunter {
   }
 
   private Bitmap decodeResource(Resources resources, int id, Request data) {
-    BitmapFactory.Options bitmapOptions = null;
+    BitmapFactory.Options bitmapOptions = createBitmapOptions(data);
     if (data.hasSize()) {
-      bitmapOptions = new BitmapFactory.Options();
       bitmapOptions.inJustDecodeBounds = true;
       BitmapFactory.decodeResource(resources, id, bitmapOptions);
       calculateInSampleSize(data.targetWidth, data.targetHeight, bitmapOptions);

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

@@ -32,6 +32,7 @@
 import org.robolectric.shadows.ShadowMatrix;
 
 import static android.graphics.Bitmap.Config.ARGB_8888;
+import static com.squareup.picasso.BitmapHunter.createBitmapOptions;
 import static com.squareup.picasso.BitmapHunter.forRequest;
 import static com.squareup.picasso.BitmapHunter.transformResult;
 import static com.squareup.picasso.Picasso.LoadedFrom.MEMORY;
@@ -328,6 +329,16 @@ public class BitmapHunterTest {
     assertThat(shadowMatrix.getPreOperations()).containsOnly("scale 2.0 1.5");
   }
 
+  @Test public void bitmapConfig() throws Exception {
+    for (Bitmap.Config config : Bitmap.Config.values()) {
+      Request data = new Request.Builder(URI_1).config(config).build();
+      Request copy = data.buildUpon().build();
+
+      assertThat(createBitmapOptions(data).inPreferredConfig).isSameAs(config);
+      assertThat(createBitmapOptions(copy).inPreferredConfig).isSameAs(config);
+    }
+  }
+
   @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();