summaryrefslogtreecommitdiff
path: root/native/graphics/jni/bitmap.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'native/graphics/jni/bitmap.cpp')
-rw-r--r--native/graphics/jni/bitmap.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/native/graphics/jni/bitmap.cpp b/native/graphics/jni/bitmap.cpp
index 4f21ccba2419..b8eb543ff835 100644
--- a/native/graphics/jni/bitmap.cpp
+++ b/native/graphics/jni/bitmap.cpp
@@ -33,10 +33,14 @@ int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap,
int32_t AndroidBitmap_getDataSpace(JNIEnv* env, jobject jbitmap) {
if (NULL == env || NULL == jbitmap) {
- return ADATASPACE_UNKNOWN; // Or return a real error?
+ return ADATASPACE_UNKNOWN;
}
android::graphics::Bitmap bitmap(env, jbitmap);
+ if (!bitmap.isValid()) {
+ return ADATASPACE_UNKNOWN;
+ }
+
return bitmap.getDataSpace();
}
@@ -96,7 +100,7 @@ int AndroidBitmap_compress(const AndroidBitmapInfo* info,
const void* pixels,
int32_t format, int32_t quality,
void* userContext,
- AndroidBitmap_compress_write_fn fn) {
+ AndroidBitmap_CompressWriteFunc fn) {
if (NULL == info || NULL == pixels || NULL == fn) {
return ANDROID_BITMAP_RESULT_BAD_PARAMETER;
}