summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nick Kralevich <nnk@google.com> 2013-10-14 20:11:05 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2013-10-14 20:11:05 +0000
commitd6c2ccb25f08447b0358173ff64725d28f207d7b (patch)
treeb287e6b7cb4b2646d4e032d034fc02137ac84a7d
parenta299862dd2d46fda54678df07db66bef1a63bb9b (diff)
parent01994c79f4e39db08a343fc9db23e771e670ef39 (diff)
Merge "core: fix arithmetic on a pointer to void"
-rw-r--r--core/jni/com_google_android_gles_jni_GLImpl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/com_google_android_gles_jni_GLImpl.cpp b/core/jni/com_google_android_gles_jni_GLImpl.cpp
index b0c26c5157c1..b3b004970b6f 100644
--- a/core/jni/com_google_android_gles_jni_GLImpl.cpp
+++ b/core/jni/com_google_android_gles_jni_GLImpl.cpp
@@ -183,7 +183,7 @@ getDirectBufferPointer(JNIEnv *_env, jobject buffer) {
if (array) {
releasePointer(_env, array, buf, 0);
}
- buf = buf + offset;
+ buf = (char*)buf + offset;
} else {
jniThrowException(_env, "java/lang/IllegalArgumentException",
"Must use a native order direct Buffer");