commit 6d38cec12baa98fc50abd033eddd359a66843efa
author Stephen Hines <srhines@google.com> Wed Jun 25 20:44:09 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 25 20:44:09 2014 +0000
tree dc9996dc86586684d87835e9f3a1943f301b84af
parent b20b0629c2ea6a8e1f7bebd0791dd21e545a4605
parent 924ed1fae19ba70b5c6267b977ae8c72b63fe99a

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

* commit '924ed1fae19ba70b5c6267b977ae8c72b63fe99a':
  Switch from size_t -> uint32_t for dimensions array.

rs/jni/android_renderscript_RenderScript.cpp

diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp
index af2e3bf..5fe631b 100644
--- a/rs/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp
@@ -1054,7 +1054,7 @@
     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);
 }