Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 13:47:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use image decoder for bitmaps

Browse Source
This commit is contained in:
M66B
2021-08-18 19:25:46 +02:00
parent 610c0e625d
commit f9e69b0919
3 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
app/src/main/java/eu/faircode/email/ImageHelper.java
View File

@@ -760,9 +760,12 @@ class ImageHelper {
static Bitmap getScaledBitmap(InputStream is, String source, String mimeType, int scaleToPixels) throws IOException {
if (TextUtils.isEmpty(mimeType))
mimeType = Helper.guessMimeType(source);
if ("image/svg+xml".equals(mimeType))
return ImageHelper.renderSvg(is, Color.WHITE, scaleToPixels);
// ImageDecoder cannot decode streams
BufferedInputStream bis = new BufferedInputStream(is);
Log.i("Probe " + source);
@@ -805,36 +808,63 @@ class ImageHelper {
private static Bitmap _decodeImage(File file, String mimeType, int scaleToPixels) throws IOException {
if (mimeType == null)
mimeType = Helper.guessMimeType(file.getName());
if ("image/svg+xml".equals(mimeType))
try (FileInputStream fis = new FileInputStream(file)) {
return ImageHelper.renderSvg(fis, Color.WHITE, scaleToPixels);
}
BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true;
BitmapFactory.decodeFile(file.getAbsolutePath(), options);
Bitmap bm = null;
int factor = 1;
while (options.outWidth / factor > scaleToPixels)
factor *= 2;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
try {
ImageDecoder.Source isource = ImageDecoder.createSource(file);
bm = ImageDecoder.decodeBitmap(isource, new ImageDecoder.OnHeaderDecodedListener() {
@Override
public void onHeaderDecoded(
@NonNull ImageDecoder decoder,
@NonNull ImageDecoder.ImageInfo info,
@NonNull ImageDecoder.Source source) {
int factor = 1;
while (info.getSize().getWidth() / factor > scaleToPixels)
factor *= 2;
Matrix rotation = getImageRotation(file);
if (factor > 1 || rotation != null) {
Log.i("Decode image factor=" + factor);
options.inJustDecodeBounds = false;
options.inSampleSize = factor;
Bitmap scaled = BitmapFactory.decodeFile(file.getAbsolutePath(), options);
if (scaled != null && rotation != null) {
Bitmap rotated = Bitmap.createBitmap(scaled, 0, 0, scaled.getWidth(), scaled.getHeight(), rotation, true);
scaled.recycle();
scaled = rotated;
Log.i("Decode image (decoder) factor=" + factor);
decoder.setTargetSampleSize(factor);
}
});
} catch (Throwable ex) {
Log.i(ex);
}
return scaled;
if (bm == null) {
BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true;
BitmapFactory.decodeFile(file.getAbsolutePath(), options);
int factor = 1;
while (options.outWidth / factor > scaleToPixels)
factor *= 2;
if (factor > 1) {
Log.i("Decode image (factory) factor=" + factor);
options.inJustDecodeBounds = false;
options.inSampleSize = factor;
bm = BitmapFactory.decodeFile(file.getAbsolutePath(), options);
} else
bm = BitmapFactory.decodeFile(file.getAbsolutePath());
}
return BitmapFactory.decodeFile(file.getAbsolutePath());
if (bm != null) {
Matrix rotation = getImageRotation(file);
if (rotation != null) {
Bitmap rotated = Bitmap.createBitmap(bm, 0, 0, bm.getWidth(), bm.getHeight(), rotation, true);
bm.recycle();
bm = rotated;
}
}
return bm;
}
static Matrix getImageRotation(File file) {