Use the original image size from Request if available

jobi · Apr 21, 2015 · e80ee40 · e80ee40
1 parent 8976c51
commit e80ee40
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/picasso/src/main/java/com/squareup/picasso/RequestHandler.java b/picasso/src/main/java/com/squareup/picasso/RequestHandler.java
@@ -129,15 +129,20 @@ boolean supportsReplay() {
    * {@link Request}, only instantiating them if needed.
    */
   static BitmapFactory.Options createBitmapOptions(Request data) {
-    final boolean justBounds = data.hasSize();
+    final boolean hasOriginalSize = data.hasOriginalSize();
+    final boolean justBounds = !hasOriginalSize && data.hasSize();
     final boolean hasConfig = data.config != null;
     BitmapFactory.Options options = null;
-    if (justBounds || hasConfig) {
+    if (hasOriginalSize || justBounds || hasConfig) {
       options = new BitmapFactory.Options();
       options.inJustDecodeBounds = justBounds;
       if (hasConfig) {
         options.inPreferredConfig = data.config;
       }
+      if (hasOriginalSize && data.hasSize()) {
+        calculateInSampleSize(data.targetWidth, data.targetHeight, data.width, data.height, options,
+                data);
+      }
     }
     return options;
   }