summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2012-10-27 10:54:18 -0700
committernicolasroard <nicolasroard@google.com>2012-10-27 10:54:18 -0700
commit6a96acff4169070a82be05d0eed3ec27bc02420d (patch)
treed0af88b1b0eff3122612ea91c0ee5f2b9490dfa6
parent38f91275d6762029269c02bcd73f0cbd6a63cc6b (diff)
downloadandroid_packages_apps_Snap-6a96acff4169070a82be05d0eed3ec27bc02420d.tar.gz
android_packages_apps_Snap-6a96acff4169070a82be05d0eed3ec27bc02420d.tar.bz2
android_packages_apps_Snap-6a96acff4169070a82be05d0eed3ec27bc02420d.zip
Fix rounding issue affecting TinyPlanet
bug:7428061 Change-Id: Ieeb4c27d4c426d7052c49ca88ca61ff0785000a3
-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)){