diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-10-27 14:15:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-27 14:15:55 -0700 |
| commit | eac071eb989e3a121b2d81ab30fd3a28d4fd5754 (patch) | |
| tree | 5dcb4c4136b2e64f58369a1f74bf07c9bc1995a9 | |
| parent | 9a343ecb4444ee0c22b570a50e1bc943fdb88c45 (diff) | |
| parent | 2d2b69b0d86ad3131faf83164253a5255ff941ed (diff) | |
| download | android_packages_apps_Gallery2-eac071eb989e3a121b2d81ab30fd3a28d4fd5754.tar.gz android_packages_apps_Gallery2-eac071eb989e3a121b2d81ab30fd3a28d4fd5754.tar.bz2 android_packages_apps_Gallery2-eac071eb989e3a121b2d81ab30fd3a28d4fd5754.zip | |
am 2d2b69b0: Fix rounding issue affecting TinyPlanet
* commit '2d2b69b0d86ad3131faf83164253a5255ff941ed':
Fix rounding issue affecting TinyPlanet
| -rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java b/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java index 77e78fe7d..24586e718 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java +++ b/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java @@ -18,12 +18,11 @@ package com.android.gallery3d.filtershow.imageshow; import android.graphics.Bitmap; import android.graphics.Matrix; +import android.graphics.Rect; import android.graphics.RectF; import com.android.gallery3d.filtershow.filters.ImageFilterGeometry; -import java.util.Arrays; - public class GeometryMetadata { // Applied in order: rotate, crop, scale. // Do not scale saved image (presumably?). @@ -59,7 +58,11 @@ public class GeometryMetadata { if (mStraightenRotation != 0) { return true; } - if (!mCropBounds.equals(mPhotoBounds)) { + Rect cropBounds = new Rect(); + mCropBounds.roundOut(cropBounds); + Rect photoBounds = new Rect(); + mPhotoBounds.roundOut(photoBounds); + if (!cropBounds.equals(photoBounds)) { return true; } if (!mFlip.equals(FLIP.NONE)){ |