diff options
| author | Stephen Hines <srhines@google.com> | 2014-06-25 20:58:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-25 20:58:34 +0000 |
| commit | ed38a32d3700bb36fa4c02f4d4ce1afa0f506471 (patch) | |
| tree | 1c3f835216f17f6624bc6aa63ff56fbd1e4f9e7d /rs | |
| parent | 7ccc10b9697983703ae2dcb1d0ea68e00092ce53 (diff) | |
| parent | af97f87a477efa05905134baa01bc6b5222b2448 (diff) | |
| download | frameworks_base-ed38a32d3700bb36fa4c02f4d4ce1afa0f506471.zip frameworks_base-ed38a32d3700bb36fa4c02f4d4ce1afa0f506471.tar.gz frameworks_base-ed38a32d3700bb36fa4c02f4d4ce1afa0f506471.tar.bz2 | |
am af97f87a: am 6d38cec1: am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."
* commit 'af97f87a477efa05905134baa01bc6b5222b2448':
Switch from size_t -> uint32_t for dimensions array.
Diffstat (limited to 'rs')
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index ae39b05..fb3b117 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -1051,7 +1051,7 @@ nScriptSetVarVE(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot, jint dimsLen = _env->GetArrayLength(dims) * sizeof(int); jint *dimsPtr = _env->GetIntArrayElements(dims, NULL); rsScriptSetVarVE((RsContext)con, (RsScript)script, slot, ptr, len, (RsElement)elem, - (const size_t*) dimsPtr, dimsLen); + (const uint32_t*) dimsPtr, dimsLen); _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); _env->ReleaseIntArrayElements(dims, dimsPtr, JNI_ABORT); } |