Merge branch 'krzysiekbielicki-issue-616'

Author: JakeWharton

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

@@ -58,7 +58,7 @@ Bitmap decodeAsset(Request data, String filePath) throws IOException {
       } finally {
         Utils.closeQuietly(is);
       }
-      calculateInSampleSize(data.targetWidth, data.targetHeight, options);
+      calculateInSampleSize(data.targetWidth, data.targetHeight, options, data);
     }
     InputStream is = assetManager.open(filePath);
     try {

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

@@ -116,7 +116,7 @@ private Bitmap decodeStream(InputStream stream, Request data) throws IOException
       } finally {
         Utils.closeQuietly(is);
       }
-      calculateInSampleSize(data.targetWidth, data.targetHeight, options);
+      calculateInSampleSize(data.targetWidth, data.targetHeight, options, data);
     }
     return BitmapFactory.decodeStream(stream, null, options);
   }

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

@@ -51,7 +51,7 @@ protected Bitmap decodeContentStream(Request data) throws IOException {
       } finally {
         Utils.closeQuietly(is);
       }
-      calculateInSampleSize(data.targetWidth, data.targetHeight, options);
+      calculateInSampleSize(data.targetWidth, data.targetHeight, options, data);
     }
     InputStream is = contentResolver.openInputStream(data.uri);
     try {

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

@@ -70,7 +70,7 @@ class MediaStoreRequestHandler extends ContentStreamRequestHandler {
       options.inJustDecodeBounds = true;
 
       calculateInSampleSize(data.targetWidth, data.targetHeight, picassoKind.width,
-              picassoKind.height, options);
+              picassoKind.height, options, data);
 
       Bitmap bitmap;
 

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

@@ -107,13 +107,13 @@ private Bitmap decodeStream(InputStream stream, Request data) throws IOException
       byte[] bytes = Utils.toByteArray(stream);
       if (calculateSize) {
         BitmapFactory.decodeByteArray(bytes, 0, bytes.length, options);
-        calculateInSampleSize(data.targetWidth, data.targetHeight, options);
+        calculateInSampleSize(data.targetWidth, data.targetHeight, options, data);
       }
       return BitmapFactory.decodeByteArray(bytes, 0, bytes.length, options);
     } else {
       if (calculateSize) {
         BitmapFactory.decodeStream(stream, null, options);
-        calculateInSampleSize(data.targetWidth, data.targetHeight, options);
+        calculateInSampleSize(data.targetWidth, data.targetHeight, options, data);
 
         markStream.reset(mark);
       }

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

@@ -135,17 +135,21 @@ 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);
+  static void calculateInSampleSize(int reqWidth, int reqHeight, BitmapFactory.Options options,
+      Request request) {
+    calculateInSampleSize(reqWidth, reqHeight, options.outWidth, options.outHeight, options,
+        request);
   }
 
   static void calculateInSampleSize(int reqWidth, int reqHeight, int width, int height,
-                                    BitmapFactory.Options options) {
+      BitmapFactory.Options options, Request request) {
     int sampleSize = 1;
     if (height > reqHeight || width > reqWidth) {
       final int heightRatio = (int) Math.floor((float) height / (float) reqHeight);
       final int widthRatio = (int) Math.floor((float) width / (float) reqWidth);
-      sampleSize = heightRatio < widthRatio ? heightRatio : widthRatio;
+      sampleSize = request.centerInside
+          ? Math.max(heightRatio, widthRatio)
+          : Math.min(heightRatio, widthRatio);
     }
     options.inSampleSize = sampleSize;
     options.inJustDecodeBounds = false;

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

@@ -49,7 +49,7 @@ private static Bitmap decodeResource(Resources resources, int id, Request data)
     final BitmapFactory.Options options = createBitmapOptions(data);
     if (requiresInSampleSize(options)) {
       BitmapFactory.decodeResource(resources, id, options);
-      calculateInSampleSize(data.targetWidth, data.targetHeight, options);
+      calculateInSampleSize(data.targetWidth, data.targetHeight, options, data);
     }
     return BitmapFactory.decodeResource(resources, id, options);
   }

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

@@ -17,7 +17,6 @@
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -55,10 +54,25 @@ public class RequestHandlerTest {
 
   @Test public void calculateInSampleSizeNoResize() {
     final BitmapFactory.Options options = new BitmapFactory.Options();
-    calculateInSampleSize(100, 100, 150, 150, options);
+    Request data = new Request.Builder(URI_1).build();
+    calculateInSampleSize(100, 100, 150, 150, options, data);
     assertThat(options.inSampleSize).isEqualTo(1);
   }
 
+  @Test public void calculateInSampleSizeResize() {
+    final BitmapFactory.Options options = new BitmapFactory.Options();
+    Request data = new Request.Builder(URI_1).build();
+    calculateInSampleSize(100, 100, 200, 200, options, data);
+    assertThat(options.inSampleSize).isEqualTo(2);
+  }
+
+  @Test public void calculateInSampleSizeResizeCenterInside() {
+    final BitmapFactory.Options options = new BitmapFactory.Options();
+    Request data = new Request.Builder(URI_1).centerInside().resize(100, 100).build();
+    calculateInSampleSize(data.targetWidth, data.targetHeight, 400, 200, options, data);
+    assertThat(options.inSampleSize).isEqualTo(4);
+  }
+
   @Test public void nullBitmapOptionsIfNoResizing() {
     // No resize must return no bitmap options
     final Request noResize = new Request.Builder(URI_1).build();