commit 6e9535d1637a83d44a6d1965d0e1a054e6507b8b
author Chris Wren <cwren@android.com> Mon Oct 29 14:21:14 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 29 14:21:14 2012 -0700
tree 46586281a09152e6c09a924a3d36bcba28724f34
parent fc7bdb558837dd6838ed6b712ac969e8f3315209
parent e9b386faa572bc3046f67aa5a34d1594c46c404c

am e9b386fa: am 9ab175f5: swap output dims after rotating image.

* commit 'e9b386faa572bc3046f67aa5a34d1594c46c404c':
  swap output dims after rotating image.

src/com/android/dreams/phototable/PhotoSource.java

diff --git a/src/com/android/dreams/phototable/PhotoSource.java b/src/com/android/dreams/phototable/PhotoSource.java
index 7f1dd51..670bd02 100644
--- a/src/com/android/dreams/phototable/PhotoSource.java
+++ b/src/com/android/dreams/phototable/PhotoSource.java
@@ -191,18 +191,18 @@
 
                     if (data.orientation != 0) {
                         log(TAG, "rotated by " + data.orientation + ": fixing");
+                        Matrix matrix = new Matrix();
+                        matrix.setRotate(data.orientation,
+                                (float) Math.floor(image.getWidth() / 2f),
+                                (float) Math.floor(image.getHeight() / 2f));
+                        image = Bitmap.createBitmap(image, 0, 0,
+                                                    options.outWidth, options.outHeight,
+                                                    matrix, true);
                         if (data.orientation == 90 || data.orientation == 270) {
                             int tmp = options.outWidth;
                             options.outWidth = options.outHeight;
                             options.outHeight = tmp;
                         }
-                        Matrix matrix = new Matrix();
-                        matrix.setRotate(data.orientation,
-                                         (float) image.getWidth() / 2,
-                                         (float) image.getHeight() / 2);
-                        image = Bitmap.createBitmap(image, 0, 0,
-                                                    options.outHeight, options.outWidth,
-                                                    matrix, true);
                     }
 
                     log(TAG, "returning bitmap " + image.getWidth() + ", " + image.getHeight());