summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2012-10-27 14:15:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-27 14:15:55 -0700
commitf8146ef8913e28cd895b6aa528f91615ed0d4c6c (patch)
tree0b7d09c455e7684c6d21ea542fa45314ea097858
parent0927998b52b08c334761d4a4cb219ef8ba3f0f8c (diff)
parent6a96acff4169070a82be05d0eed3ec27bc02420d (diff)
downloadandroid_packages_apps_Snap-f8146ef8913e28cd895b6aa528f91615ed0d4c6c.tar.gz
android_packages_apps_Snap-f8146ef8913e28cd895b6aa528f91615ed0d4c6c.tar.bz2
android_packages_apps_Snap-f8146ef8913e28cd895b6aa528f91615ed0d4c6c.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.java9
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)){