am f730b759: am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"

* commit 'f730b7599d18c49e132b73856697b7444cdf091f': core: fix arithmetic on a pointer to void
2013-10-14 13:17:20 -07:00
parent 7a531be13b f730b7599d
commit 1f5da180b4
1 changed files with 1 additions and 1 deletions
--- 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");