diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-12-12 16:10:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-12 16:10:28 -0800 |
| commit | f08403ba92999448512c4af7062fe30206e32dcf (patch) | |
| tree | cd3a6d1c8e3ecd4cb2378a75b87ae79ec12bc17a /libs | |
| parent | b2bf2471b1f0b4a76660e63f91a8de84cc643da8 (diff) | |
| parent | 74e0fcaed1cd20ae8632224ff5a5404ff1a6e497 (diff) | |
| download | frameworks_base-f08403ba92999448512c4af7062fe30206e32dcf.zip frameworks_base-f08403ba92999448512c4af7062fe30206e32dcf.tar.gz frameworks_base-f08403ba92999448512c4af7062fe30206e32dcf.tar.bz2 | |
am 74e0fcae: am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1
* commit '74e0fcaed1cd20ae8632224ff5a5404ff1a6e497':
SurfaceTexture: fix a verbose-log compile error
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gui/SurfaceTexture.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ status_t SurfaceTexture::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h, 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; } |