diff options
author | John Reck <jreck@google.com> | 2015-04-20 22:06:31 +0000 |
---|---|---|
committer | John Reck <jreck@google.com> | 2015-04-20 22:06:31 +0000 |
commit | edc22fba5921f5c2d3502727e707f959b8c3a460 (patch) | |
tree | 947113958a48609f55d003e2735739727b6cc70f /rs | |
parent | a771b9861d11671c780092d35c0062eeefcf37c0 (diff) | |
download | frameworks_base-edc22fba5921f5c2d3502727e707f959b8c3a460.zip frameworks_base-edc22fba5921f5c2d3502727e707f959b8c3a460.tar.gz frameworks_base-edc22fba5921f5c2d3502727e707f959b8c3a460.tar.bz2 |
Revert "Change how Java Bitmaps are accessed in a few places"
Bug: 20207616
This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0.
Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
Diffstat (limited to 'rs')
-rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 841e684..40fad38 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -1063,8 +1063,9 @@ static jlong nAllocationCreateFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong type, jint mip, jobject jbitmap, jint usage) { - SkBitmap bitmap; - GraphicsJNI::getSkBitmap(_env, jbitmap, &bitmap); + SkBitmap const * nativeBitmap = + GraphicsJNI::getSkBitmap(_env, jbitmap); + const SkBitmap& bitmap(*nativeBitmap); bitmap.lockPixels(); const void* ptr = bitmap.getPixels(); @@ -1079,8 +1080,9 @@ static jlong nAllocationCreateBitmapBackedAllocation(JNIEnv *_env, jobject _this, jlong con, jlong type, jint mip, jobject jbitmap, jint usage) { - SkBitmap bitmap; - GraphicsJNI::getSkBitmap(_env, jbitmap, &bitmap); + SkBitmap const * nativeBitmap = + GraphicsJNI::getSkBitmap(_env, jbitmap); + const SkBitmap& bitmap(*nativeBitmap); bitmap.lockPixels(); const void* ptr = bitmap.getPixels(); @@ -1095,8 +1097,9 @@ static jlong nAllocationCubeCreateFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong type, jint mip, jobject jbitmap, jint usage) { - SkBitmap bitmap; - GraphicsJNI::getSkBitmap(_env, jbitmap, &bitmap); + SkBitmap const * nativeBitmap = + GraphicsJNI::getSkBitmap(_env, jbitmap); + const SkBitmap& bitmap(*nativeBitmap); bitmap.lockPixels(); const void* ptr = bitmap.getPixels(); @@ -1110,8 +1113,9 @@ nAllocationCubeCreateFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong ty static void nAllocationCopyFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jobject jbitmap) { - SkBitmap bitmap; - GraphicsJNI::getSkBitmap(_env, jbitmap, &bitmap); + SkBitmap const * nativeBitmap = + GraphicsJNI::getSkBitmap(_env, jbitmap); + const SkBitmap& bitmap(*nativeBitmap); int w = bitmap.width(); int h = bitmap.height(); @@ -1126,8 +1130,9 @@ nAllocationCopyFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong alloc, j static void nAllocationCopyToBitmap(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jobject jbitmap) { - SkBitmap bitmap; - GraphicsJNI::getSkBitmap(_env, jbitmap, &bitmap); + SkBitmap const * nativeBitmap = + GraphicsJNI::getSkBitmap(_env, jbitmap); + const SkBitmap& bitmap(*nativeBitmap); bitmap.lockPixels(); void* ptr = bitmap.getPixels(); |