commit 8609d94b69c514f2ae4b9091cd026b78bff618a3
author Jesse Wilson <jessewilson@google.com> Fri Dec 16 07:36:32 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 16 07:36:32 2011 -0800
tree 76a85ebc08e2538fb6a27cea972455efcc38a856
parent 02e69b2852d6c712064a4e191cece866302de8ca
parent 9479f3bb085afa21630f19d02d213d3993bf21c1

Merge "Track libcore tests moving from frameworks/base to libcore."

libs/gui/SurfaceTexture.cpp

diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index 6f3051a..4310bed 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -500,8 +500,8 @@
         eglDestroySyncKHR(dpy, fence);
     }
 
-    ST_LOGV("dequeueBuffer: returning slot=%d buf=%p flags=%#x", buf,
-            mSlots[buf].mGraphicBuffer->handle, returnFlags);
+    ST_LOGV("dequeueBuffer: returning slot=%d buf=%p flags=%#x", *outBuf,
+            mSlots[*outBuf].mGraphicBuffer->handle, returnFlags);
 
     return returnFlags;
 }

opengl/libs/ETC1/etc1.cpp

diff --git a/opengl/libs/ETC1/etc1.cpp b/opengl/libs/ETC1/etc1.cpp
index 5ed2c3c..97d1085 100644
--- a/opengl/libs/ETC1/etc1.cpp
+++ b/opengl/libs/ETC1/etc1.cpp
@@ -149,13 +149,13 @@
 static
 inline int convert8To4(int b) {
     int c = b & 0xff;
-    return divideBy255(b * 15);
+    return divideBy255(c * 15);
 }
 
 static
 inline int convert8To5(int b) {
     int c = b & 0xff;
-    return divideBy255(b * 31);
+    return divideBy255(c * 31);
 }
 
 static