From c2bea6fe0e5d00db95a7c0b0eee68228d1fedab5 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 16 May 2018 21:36:40 +0200 Subject: =?UTF-8?q?don=E2=80=99t=20scale=20images=20to=20a=200=20width=20o?= =?UTF-8?q?r=20height?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/de/pixart/messenger/persistance/FileBackend.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java index 7ba41d8ad..17290864a 100644 --- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java +++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java @@ -225,21 +225,23 @@ public class FileBackend { } - public Bitmap resize(Bitmap originalBitmap, int size) { + private Bitmap resize(final Bitmap originalBitmap, int size) throws IOException { int w = originalBitmap.getWidth(); int h = originalBitmap.getHeight(); - if (Math.max(w, h) > size) { + if (w <= 0 || h <= 0) { + throw new IOException("Decoded bitmap reported bounds smaller 0"); + } else if (Math.max(w, h) > size) { int scalledW; int scalledH; if (w <= h) { - scalledW = (int) (w / ((double) h / size)); + scalledW = Math.max((int) (w / ((double) h / size)), 1); scalledH = size; } else { scalledW = size; - scalledH = (int) (h / ((double) w / size)); + scalledH = Math.max((int) (h / ((double) w / size)), 1); } - Bitmap result = Bitmap.createScaledBitmap(originalBitmap, scalledW, scalledH, true); - if (originalBitmap != null && !originalBitmap.isRecycled()) { + final Bitmap result = Bitmap.createScaledBitmap(originalBitmap, scalledW, scalledH, true); + if (!originalBitmap.isRecycled()) { originalBitmap.recycle(); } return result; -- cgit v1.2.3