am e04e8b2a: Fixed a crash when an image with an odd width/height was selected

* commit 'e04e8b2a142f22bfeb8729e542f51d5510327eb9': Fixed a crash when an image with an odd width/height was selected
2014-03-14 17:45:16 +00:00
parent 47bc68d27d e04e8b2a14
commit 3f3a79a2fd
1 changed files with 8 additions and 0 deletions
@@ -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();