commit c8eb6fbcff61f5f664c323f51bd4bd893499a22e
author Stuart Scott <stuartscott@google.com> Fri May 02 23:23:06 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 02 23:23:06 2014 +0000
tree 49d879d726758576448ca93fb056d01d26a31386
parent 8b69297759bb2f4584e3c120ed8de029693605d8
parent 4ca67e3a08e1c0acf698719eb7489dad42e51e7d

am 4ca67e3a: am 61200853: am 295b2051: Merge "libctsopengl_jni: Change char* to unsigned char*"

* commit '4ca67e3a08e1c0acf698719eb7489dad42e51e7d':
  libctsopengl_jni: Change char* to unsigned char*

suite/cts/deviceTests/opengl/jni/graphics/GLUtils.cpp

diff --git a/suite/cts/deviceTests/opengl/jni/graphics/GLUtils.cpp b/suite/cts/deviceTests/opengl/jni/graphics/GLUtils.cpp
index 9076f39..ea166a1 100644
--- a/suite/cts/deviceTests/opengl/jni/graphics/GLUtils.cpp
+++ b/suite/cts/deviceTests/opengl/jni/graphics/GLUtils.cpp
@@ -77,7 +77,8 @@
 }
 
 static int readInt(char* b) {
-    return (((int) b[0]) << 24) | (((int) b[1]) << 16) | (((int) b[2]) << 8) | ((int) b[3]);
+    unsigned char* ub = (unsigned char*) b;
+    return (((int) ub[0]) << 24) | (((int) ub[1]) << 16) | (((int) ub[2]) << 8) | ((int) ub[3]);
 }
 
 static float readFloat(char* b) {