summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/crop/CropMath.java
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2013-05-14 00:58:37 -0700
committerRuben Brunk <rubenbrunk@google.com>2013-05-14 01:00:59 -0700
commit7f9e16ed4a4feb1d7ae15fb9e73d84d95ee53c2d (patch)
treed59abad2197c863ba95c732a971dd88ea67f81c1 /src/com/android/gallery3d/filtershow/crop/CropMath.java
parent49b9ba2ba89760f297ecc7d6d94d68fb4b836be1 (diff)
downloadandroid_packages_apps_Snap-7f9e16ed4a4feb1d7ae15fb9e73d84d95ee53c2d.tar.gz
android_packages_apps_Snap-7f9e16ed4a4feb1d7ae15fb9e73d84d95ee53c2d.tar.bz2
android_packages_apps_Snap-7f9e16ed4a4feb1d7ae15fb9e73d84d95ee53c2d.zip
Fix FP rounding error for crop bounds.
Bug: 8874599 Change-Id: I94198e4dcdbb0afa1dd788130645855b33e8f30b
Diffstat (limited to 'src/com/android/gallery3d/filtershow/crop/CropMath.java')
-rw-r--r--src/com/android/gallery3d/filtershow/crop/CropMath.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/filtershow/crop/CropMath.java b/src/com/android/gallery3d/filtershow/crop/CropMath.java
index 849ac60ef..671554f16 100644
--- a/src/com/android/gallery3d/filtershow/crop/CropMath.java
+++ b/src/com/android/gallery3d/filtershow/crop/CropMath.java
@@ -196,14 +196,13 @@ public class CropMath {
float finalH = origH;
if (origA < a) {
finalH = origW / a;
+ r.top = r.centerY() - finalH / 2;
+ r.bottom = r.top + finalH;
} else {
finalW = origH * a;
+ r.left = r.centerX() - finalW / 2;
+ r.right = r.left + finalW;
}
- float centX = r.centerX();
- float centY = r.centerY();
- float hw = finalW / 2;
- float hh = finalH / 2;
- r.set(centX - hw, centY - hh, centX + hw, centY + hh);
}
/**