summaryrefslogtreecommitdiffstats
path: root/rs/jni
diff options
context:
space:
mode:
authorYang Ni <yangni@google.com>2015-03-26 14:35:22 -0700
committerYang Ni <yangni@google.com>2015-03-30 10:45:34 -0700
commit4c93c8c93a66a8932d84a52bd922c3b7ad1565bb (patch)
tree4606ec940c7fb54256a499aef84be6aba4d94b2d /rs/jni
parent631565abd6cadd65befe197afa7bac0d44f70fb2 (diff)
downloadframeworks_base-4c93c8c93a66a8932d84a52bd922c3b7ad1565bb.zip
frameworks_base-4c93c8c93a66a8932d84a52bd922c3b7ad1565bb.tar.gz
frameworks_base-4c93c8c93a66a8932d84a52bd922c3b7ad1565bb.tar.bz2
Fix value size data type in closure creation.
b/19944127 Also added references to arguments and global values in a closure to keep them live in Java while native code may access them. Change-Id: I1179d34aa67f845578740e71cc2da4f82419f251
Diffstat (limited to 'rs/jni')
-rw-r--r--rs/jni/android_renderscript_RenderScript.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp
index ba20881..3591199 100644
--- a/rs/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp
@@ -372,7 +372,7 @@ nClosureCreate(JNIEnv *_env, jobject _this, jlong con, jlong kernelID,
return (jlong)(uintptr_t)rsClosureCreate(
(RsContext)con, (RsScriptKernelID)kernelID, (RsAllocation)returnValue,
fieldIDs, (size_t)fieldIDs_length, values, (size_t)values_length,
- (size_t*)sizes, (size_t)sizes_length,
+ (int*)sizes, (size_t)sizes_length,
depClosures, (size_t)depClosures_length,
depFieldIDs, (size_t)depFieldIDs_length);
}
@@ -405,7 +405,7 @@ nInvokeClosureCreate(JNIEnv *_env, jobject _this, jlong con, jlong invokeID,
return (jlong)(uintptr_t)rsInvokeClosureCreate(
(RsContext)con, (RsScriptInvokeID)invokeID, jParams, jParamLength,
fieldIDs, (size_t)fieldIDs_length, values, (size_t)values_length,
- (size_t*)sizes, (size_t)sizes_length);
+ (int*)sizes, (size_t)sizes_length);
}
static void