diff options
| author | John Reck <jreck@google.com> | 2015-05-04 14:34:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-04 14:34:39 +0000 |
| commit | 1641c0cb0b6baf313c82846fe4f64007078c604f (patch) | |
| tree | 0bb708048847af2e31dccd2361a5e3cc95fabca0 /core/jni | |
| parent | 335f043bdb20f3528f486ad91eb9e1fdf8f673ab (diff) | |
| parent | c6e2e8ff474ae44bab5b9eb665851118abd27b68 (diff) | |
| download | frameworks_base-1641c0cb0b6baf313c82846fe4f64007078c604f.zip frameworks_base-1641c0cb0b6baf313c82846fe4f64007078c604f.tar.gz frameworks_base-1641c0cb0b6baf313c82846fe4f64007078c604f.tar.bz2 | |
Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev
Diffstat (limited to 'core/jni')
| -rwxr-xr-x | core/jni/android/graphics/Bitmap.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index 7a934bd..5c95f8a 100755 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -857,6 +857,13 @@ static void Bitmap_prepareToDraw(JNIEnv* env, jobject, jlong bitmapHandle) { bitmap->unlockPixels(); } +static jlong Bitmap_refPixelRef(JNIEnv* env, jobject, jlong bitmapHandle) { + SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(bitmapHandle); + SkPixelRef* pixelRef = bitmap ? bitmap->pixelRef() : nullptr; + SkSafeRef(pixelRef); + return reinterpret_cast<jlong>(pixelRef); +} + /////////////////////////////////////////////////////////////////////////////// static JNINativeMethod gBitmapMethods[] = { @@ -896,6 +903,7 @@ static JNINativeMethod gBitmapMethods[] = { (void*)Bitmap_copyPixelsFromBuffer }, { "nativeSameAs", "(JJ)Z", (void*)Bitmap_sameAs }, { "nativePrepareToDraw", "(J)V", (void*)Bitmap_prepareToDraw }, + { "nativeRefPixelRef", "(J)J", (void*)Bitmap_refPixelRef }, }; int register_android_graphics_Bitmap(JNIEnv* env) |