Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6d38cec1: am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."

Browse Source 
* commit '6d38cec12baa98fc50abd033eddd359a66843efa':
  Switch from size_t -> uint32_t for dimensions array.
This commit is contained in:
Stephen Hines
2014-06-25 20:50:26 +00:00
committed by Android Git Automerger
parent 3edaf370e3 6d38cec12b
commit af97f87a47
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rs/jni/android_renderscript_RenderScript.cpp
View File

@@ -1054,7 +1054,7 @@ nScriptSetVarVE(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot,
jint dimsLen = _env->GetArrayLength(dims) * sizeof(int); jint dimsLen = _env->GetArrayLength(dims) * sizeof(int);
jint *dimsPtr = _env->GetIntArrayElements(dims, NULL); jint *dimsPtr = _env->GetIntArrayElements(dims, NULL);
rsScriptSetVarVE((RsContext)con, (RsScript)script, slot, ptr, len, (RsElement)elem, 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->ReleaseByteArrayElements(data, ptr, JNI_ABORT);
_env->ReleaseIntArrayElements(dims, dimsPtr, JNI_ABORT); _env->ReleaseIntArrayElements(dims, dimsPtr, JNI_ABORT);
} }