diff options
| author | Chad Jones <chadj@google.com> | 2015-03-05 19:34:26 +0000 |
|---|---|---|
| committer | Chad Jones <chadj@google.com> | 2015-03-05 19:34:26 +0000 |
| commit | c02977e3bbfaaedcb1b1d67e1692becc7dddd59b (patch) | |
| tree | 24564767d59138f5c039efefe4744ee35c23ac7e /native | |
| parent | b2915245b74b3b5541b123e38403f8e26426b4b7 (diff) | |
| download | frameworks_base-c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.zip frameworks_base-c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.tar.gz frameworks_base-c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.tar.bz2 | |
Revert "Cleanup Bitmap JNI"
This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7.
Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
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 ddb01a0..ea32edc 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::getSkBitmap(env, jbitmap); + SkBitmap* bm = GraphicsJNI::getNativeBitmap(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::getSkBitmap(env, jbitmap); + SkBitmap* bm = GraphicsJNI::getNativeBitmap(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::getSkBitmap(env, jbitmap); + SkBitmap* bm = GraphicsJNI::getNativeBitmap(env, jbitmap); if (NULL == bm) { return ANDROID_BITMAP_RESULT_JNI_EXCEPTION; } |