diff options
author | Selim Cinek <cinek@google.com> | 2014-03-14 17:47:33 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 17:47:33 +0000 |
commit | 9bf1b92928b0c85abd60e643aba29d0a51691513 (patch) | |
tree | 76ff5be3abf7f2abddd0b7bd61be625057cfaefe | |
parent | 6e8246dcb6d7014fb2ae193f08c647ecd6dc784b (diff) | |
parent | 3f3a79a2fdc3cd4c765ee967fe0c6b7fc87c4a23 (diff) | |
download | android_packages_apps_Trebuchet-9bf1b92928b0c85abd60e643aba29d0a51691513.tar.gz android_packages_apps_Trebuchet-9bf1b92928b0c85abd60e643aba29d0a51691513.tar.bz2 android_packages_apps_Trebuchet-9bf1b92928b0c85abd60e643aba29d0a51691513.zip |
am 3f3a79a2: am e04e8b2a: Fixed a crash when an image with an odd width/height was selected
* commit '3f3a79a2fdc3cd4c765ee967fe0c6b7fc87c4a23':
Fixed a crash when an image with an odd width/height was selected
-rw-r--r-- | WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java index bbbd9105c..1f35622af 100644 --- a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java +++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java @@ -366,6 +366,14 @@ public class WallpaperCropActivity extends Activity { getWindowManager()); // Get the crop RectF cropRect = mCropView.getCrop(); + + // due to rounding errors in the cropview renderer the edges can be slightly offset + // therefore we ensure that the boundaries are sanely defined + cropRect.left = Math.max(0, cropRect.left); + cropRect.right = Math.min(mCropView.getWidth(), cropRect.right); + cropRect.top = Math.max(0, cropRect.top); + cropRect.bottom = Math.min(mCropView.getHeight(), cropRect.bottom); + int cropRotation = mCropView.getImageRotation(); float cropScale = mCropView.getWidth() / (float) cropRect.width(); |