commit aef12450d2f863fe3ce82458e46f3778b791cc33
author Narayan Kamath <narayan@google.com> Thu Jan 16 07:31:56 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 16 07:31:56 2014 -0800
tree cbb88151f271b722cf576d120725ebaa3f1f7b9c
parent 8796ab7f22d3e9f5b85571e8851851c023416f96
parent 1b0f0be0979cbe00641d5d386691e87d668a2aa8

am 1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"

* commit '1b0f0be0979cbe00641d5d386691e87d668a2aa8':
  Make YuvToJpegEncoder more JNI compliant

graphics/jni/android_renderscript_RenderScript.cpp

diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp
index a4221dc..cbc4e5a 100644
--- a/graphics/jni/android_renderscript_RenderScript.cpp
+++ b/graphics/jni/android_renderscript_RenderScript.cpp
@@ -335,7 +335,7 @@
     jint len = 0;
     if (data) {
         len = _env->GetArrayLength(data);
-        ptr = _env->GetIntArrayElements(data, NULL);
+        jint *ptr = _env->GetIntArrayElements(data, NULL);
     }
     LOG_API("nContextSendMessage, con(%p), id(%i), len(%i)", con, id, len);
     rsContextSendMessage(con, id, (const uint8_t *)ptr, len * sizeof(int));