From 34af906220a14d0bdbfa26b949c1fc47195950b8 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Thu, 28 Nov 2019 18:33:13 +0100 Subject: [PATCH] Throw if toBitmap is called with a DNG file --- .../java/com/otaliastudios/cameraview/PictureResult.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/PictureResult.java b/cameraview/src/main/java/com/otaliastudios/cameraview/PictureResult.java index d73724d4..8a1a942a 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/PictureResult.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/PictureResult.java @@ -135,8 +135,13 @@ public class PictureResult { * @param callback a callback to be notified of image decoding */ public void toBitmap(int maxWidth, int maxHeight, @NonNull BitmapCallback callback) { - CameraUtils.decodeBitmap(getData(), maxWidth, maxHeight, new BitmapFactory.Options(), - rotation, callback); + if (format == PictureFormat.JPEG) { + CameraUtils.decodeBitmap(getData(), maxWidth, maxHeight, new BitmapFactory.Options(), + rotation, callback); + } else { + throw new UnsupportedOperationException("PictureResult.toBitmap() does not support " + + "this picture format: " + format); + } } /**