diff options
| author | John Reck <jreck@google.com> | 2015-03-04 08:36:12 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2015-03-05 09:55:02 -0800 |
| commit | b2915245b74b3b5541b123e38403f8e26426b4b7 (patch) | |
| tree | 295bee60e89bba1ae2221bf40833a80e6d2c41ef /native | |
| parent | f855b0d2d0c0c157d657668fcb98097e2aca097e (diff) | |
| download | frameworks_base-b2915245b74b3b5541b123e38403f8e26426b4b7.zip frameworks_base-b2915245b74b3b5541b123e38403f8e26426b4b7.tar.gz frameworks_base-b2915245b74b3b5541b123e38403f8e26426b4b7.tar.bz2 | |
Cleanup Bitmap JNI
Fix a bunch of places where mNativeBitmap was being
poked at directly, switch them either to the NDK API
or to GraphicsJNI where it made sense
Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d
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; } |