TouchInstinct
/
android-crop
297
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don’t attempt to scale an image that could not be decoded

This commit is contained in:
Jamie McDonald 2015-11-20 15:22:41 +01:00
parent 1921af545c
commit d8a549bb56
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java
View File

@ -344,7 +344,7 @@ public class CropImageActivity extends MonitoredActivity {
try {
croppedImage = decoder.decodeRegion(rect, new BitmapFactory.Options());
if (rect.width() > outWidth || rect.height() > outHeight) {
if (croppedImage != null && (rect.width() > outWidth || rect.height() > outHeight)) {
Matrix matrix = new Matrix();
matrix.postScale((float) outWidth / rect.width(), (float) outHeight / rect.height());
croppedImage = Bitmap.createBitmap(croppedImage, 0, 0, croppedImage.getWidth(), croppedImage.getHeight(), matrix, true);