Fix NPE in BitmapUtil.toJpeg()

Fixes #9513
This commit is contained in:
Greyson Parrelli 2020-03-31 10:11:59 -04:00
parent 5dc3cc65a8
commit 822682caba

View File

@ -77,8 +77,12 @@ public class CameraXUtil {
Log.w(TAG, String.format(Locale.ENGLISH, "Decoded image dimensions differed from stated dimensions! Stated: %d x %d, Decoded: %d x %d", Log.w(TAG, String.format(Locale.ENGLISH, "Decoded image dimensions differed from stated dimensions! Stated: %d x %d, Decoded: %d x %d",
image.getWidth(), image.getHeight(), dimens.first, dimens.second)); image.getWidth(), image.getHeight(), dimens.first, dimens.second));
Log.w(TAG, "Ignoring the stated rotation and rotating the crop rect 90 degrees (stated rotation is " + rotation + " degrees)."); Log.w(TAG, "Ignoring the stated rotation and rotating the crop rect 90 degrees (stated rotation is " + rotation + " degrees).");
rotation = 0; rotation = 0;
cropRect = new Rect(cropRect.top, cropRect.left, cropRect.bottom, cropRect.right);
if (cropRect != null) {
cropRect = new Rect(cropRect.top, cropRect.left, cropRect.bottom, cropRect.right);
}
} }
} catch (BitmapDecodingException e) { } catch (BitmapDecodingException e) {
Log.w(TAG, "Failed to decode!", e); Log.w(TAG, "Failed to decode!", e);