Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed a crash when an image with an odd width/height was selected"

Browse Source
This commit is contained in:
Selim Cinek
2014-03-14 17:50:11 +00:00
committed by Android (Google) Code Review
parent a84b445306 912e0df89c
commit 20b37400eb
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java
View File

@@ -340,6 +340,13 @@ public class WallpaperCropActivity extends Activity {
getWindowManager()); getWindowManager());
// Get the crop // Get the crop
RectF cropRect = mCropView.getCrop(); 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(); int cropRotation = mCropView.getImageRotation();
float cropScale = mCropView.getWidth() / (float) cropRect.width(); float cropScale = mCropView.getWidth() / (float) cropRect.width();