am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height

* commit 'eb95e74e21a0e910704ca2fd67e074ab640bfba3':
  DO NOT MERGE - Fixed crash for odd image width/height
This commit is contained in:
Selim Cinek
2014-03-14 20:47:34 +00:00
committed by Android Git Automerger

View File

@@ -340,6 +340,13 @@ 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();