diff options
Diffstat (limited to 'rs')
| -rw-r--r-- | rs/jni/Android.mk | 1 | ||||
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 25 |
2 files changed, 15 insertions, 11 deletions
diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk index 0658620..94f0859 100644 --- a/rs/jni/Android.mk +++ b/rs/jni/Android.mk @@ -25,7 +25,6 @@ LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ frameworks/rs \ frameworks/base/core/jni \ - frameworks/base/libs/hwui \ $(rs_generated_include_dir) LOCAL_CFLAGS += -Wno-unused-parameter -std=c++11 diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index ae48a5f..cbe87fc 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -1102,8 +1102,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(); @@ -1118,8 +1119,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(); @@ -1134,8 +1136,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(); @@ -1149,8 +1152,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(); @@ -1165,8 +1169,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(); |