xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AndroidBitmap: convert unsupported bitmap formats (#805)

Browse Source
This commit is contained in:
Emux 2021-01-29 16:51:31 +02:00 committed by GitHub
parent 3bb8ce00c5
commit 22ed9653ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vtm-android/src/org/oscim/android/canvas/AndroidBitmap.java
View File

@ -1,7 +1,7 @@
/* /*
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2016 Longri * Copyright 2016 Longri
* Copyright 2016-2018 devemux86 * Copyright 2016-2021 devemux86
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
@ -22,7 +22,6 @@ import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.opengl.GLES20; import android.opengl.GLES20;
import android.opengl.GLUtils; import android.opengl.GLUtils;
import org.oscim.backend.CanvasAdapter; import org.oscim.backend.CanvasAdapter;
import org.oscim.utils.GraphicUtils; import org.oscim.utils.GraphicUtils;
import org.oscim.utils.IOUtils; import org.oscim.utils.IOUtils;
@ -39,6 +38,7 @@ public class AndroidBitmap implements org.oscim.backend.canvas.Bitmap {
Bitmap bitmap = BitmapFactory.decodeStream(inputStream); Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
try { try {
GLUtils.getType(bitmap); GLUtils.getType(bitmap);
GLUtils.getInternalFormat(bitmap);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
bitmap = bitmap.copy(ARGB_8888, false); bitmap = bitmap.copy(ARGB_8888, false);
} }
@ -95,6 +95,9 @@ public class AndroidBitmap implements org.oscim.backend.canvas.Bitmap {
@Override @Override
public void uploadToTexture(boolean replace) { public void uploadToTexture(boolean replace) {
if (mBitmap.isRecycled())
return;
int format = GLUtils.getInternalFormat(mBitmap); int format = GLUtils.getInternalFormat(mBitmap);
int type = GLUtils.getType(mBitmap); int type = GLUtils.getType(mBitmap);