Merge pull request square#401 from square/dimitris/bloo

Fix 90/270 exifrotations to swap dimens

Author: JakeWharton

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

@@ -342,8 +342,9 @@ static Bitmap applyCustomTransformations(List<Transformation> transformations, B
   }
 
   static Bitmap transformResult(Request data, Bitmap result, int exifRotation) {
-    int inWidth = result.getWidth();
-    int inHeight = result.getHeight();
+    boolean swapDimens = exifRotation == 90 || exifRotation == 270;
+    int inWidth = swapDimens ? result.getHeight() : result.getWidth();
+    int inHeight = swapDimens ? result.getWidth() : result.getHeight();
 
     int drawX = 0;
     int drawY = 0;

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

@@ -539,6 +539,20 @@ public class BitmapHunterTest {
     assertThat(shadowMatrix.getPreOperations()).containsOnly("scale 0.5 0.5");
   }
 
+  @Test public void exif90SwapsDimensions() throws Exception {
+    Request data = new Request.Builder(URI_1).build();
+    Bitmap in = Bitmap.createBitmap(30, 40, null);
+    Bitmap out = transformResult(data, in, 90);
+    assertThat(out).hasWidth(40).hasHeight(30);
+  }
+
+  @Test public void exif270SwapsDimensions() throws Exception {
+    Request data = new Request.Builder(URI_1).build();
+    Bitmap in = Bitmap.createBitmap(30, 40, null);
+    Bitmap out = transformResult(data, in, 270);
+    assertThat(out).hasWidth(40).hasHeight(30);
+  }
+
   @Test public void reusedBitmapIsNotRecycled() throws Exception {
     Request data = new Request.Builder(URI_1).build();
     Bitmap source = Bitmap.createBitmap(10, 10, ARGB_8888);