diff options
| author | John Reck <jreck@google.com> | 2015-03-05 13:50:31 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2015-03-05 13:56:16 -0800 |
| commit | f4faeac3525fe1ce3707ab785a1651aec367589d (patch) | |
| tree | b49502dc2381517f3314d16fae1eef7414314a8f /native | |
| parent | cd4ed96d10d49cb182e66aa1735f2de7596707ee (diff) | |
| download | frameworks_base-f4faeac3525fe1ce3707ab785a1651aec367589d.zip frameworks_base-f4faeac3525fe1ce3707ab785a1651aec367589d.tar.gz frameworks_base-f4faeac3525fe1ce3707ab785a1651aec367589d.tar.bz2 | |
Cleanup Bitmap JNI attempt #2
Original version missed a spot
This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.
Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
Diffstat (limited to 'native')
| -rw-r--r-- | native/graphics/jni/bitmap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/native/graphics/jni/bitmap.cpp b/native/graphics/jni/bitmap.cpp index ea32edc..ddb01a0 100644 --- a/native/graphics/jni/bitmap.cpp +++ b/native/graphics/jni/bitmap.cpp @@ -27,7 +27,7 @@ int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap, return ANDROID_BITMAP_RESULT_BAD_PARAMETER; } - SkBitmap* bm = GraphicsJNI::getNativeBitmap(env, jbitmap); + SkBitmap* bm = GraphicsJNI::getSkBitmap(env, jbitmap); if (NULL == bm) { return ANDROID_BITMAP_RESULT_JNI_EXCEPTION; } @@ -64,7 +64,7 @@ int AndroidBitmap_lockPixels(JNIEnv* env, jobject jbitmap, void** addrPtr) { return ANDROID_BITMAP_RESULT_BAD_PARAMETER; } - SkBitmap* bm = GraphicsJNI::getNativeBitmap(env, jbitmap); + SkBitmap* bm = GraphicsJNI::getSkBitmap(env, jbitmap); if (NULL == bm) { return ANDROID_BITMAP_RESULT_JNI_EXCEPTION; } @@ -87,7 +87,7 @@ int AndroidBitmap_unlockPixels(JNIEnv* env, jobject jbitmap) { return ANDROID_BITMAP_RESULT_BAD_PARAMETER; } - SkBitmap* bm = GraphicsJNI::getNativeBitmap(env, jbitmap); + SkBitmap* bm = GraphicsJNI::getSkBitmap(env, jbitmap); if (NULL == bm) { return ANDROID_BITMAP_RESULT_JNI_EXCEPTION; } |