Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extend recycled bitmap check to all GLUtils APIs.

Browse Source 
Change-Id: I9ea0022b167af2153190b6642aa303232e257379
This commit is contained in:
Jack Palevich
2011-02-07 11:36:47 -08:00
parent e44e28fa11
commit 70a1875635
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
opengl/java/android/opengl/GLUtils.java
View File

@@ -47,6 +47,9 @@ public final class GLUtils {
if (bitmap == null) {
throw new NullPointerException("getInternalFormat can't be used with a null Bitmap");
}
if (bitmap.isRecycled()) {
throw new IllegalArgumentException("bitmap is recycled");
}
int result = native_getInternalFormat(bitmap);
if (result < 0) {
throw new IllegalArgumentException("Unknown internalformat");
@@ -66,6 +69,9 @@ public final class GLUtils {
if (bitmap == null) {
throw new NullPointerException("getType can't be used with a null Bitmap");
}
if (bitmap.isRecycled()) {
throw new IllegalArgumentException("bitmap is recycled");
}
int result = native_getType(bitmap);
if (result < 0) {
throw new IllegalArgumentException("Unknown type");
@@ -100,6 +106,9 @@ public final class GLUtils {
if (bitmap == null) {
throw new NullPointerException("texImage2D can't be used with a null Bitmap");
}
if (bitmap.isRecycled()) {
throw new IllegalArgumentException("bitmap is recycled");
}
if (native_texImage2D(target, level, internalformat, bitmap, -1, border)!=0) {
throw new IllegalArgumentException("invalid Bitmap format");
}
@@ -123,6 +132,9 @@ public final class GLUtils {
if (bitmap == null) {
throw new NullPointerException("texImage2D can't be used with a null Bitmap");
}
if (bitmap.isRecycled()) {
throw new IllegalArgumentException("bitmap is recycled");
}
if (native_texImage2D(target, level, internalformat, bitmap, type, border)!=0) {
throw new IllegalArgumentException("invalid Bitmap format");
}
@@ -177,6 +189,9 @@ public final class GLUtils {
if (bitmap == null) {
throw new NullPointerException("texSubImage2D can't be used with a null Bitmap");
}
if (bitmap.isRecycled()) {
throw new IllegalArgumentException("bitmap is recycled");
}
int type = getType(bitmap);
if (native_texSubImage2D(target, level, xoffset, yoffset, bitmap, -1, type)!=0) {
throw new IllegalArgumentException("invalid Bitmap format");
@@ -199,6 +214,9 @@ public final class GLUtils {
if (bitmap == null) {
throw new NullPointerException("texSubImage2D can't be used with a null Bitmap");
}
if (bitmap.isRecycled()) {
throw new IllegalArgumentException("bitmap is recycled");
}
if (native_texSubImage2D(target, level, xoffset, yoffset, bitmap, format, type)!=0) {
throw new IllegalArgumentException("invalid Bitmap format");
}