Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1

Jamie Gennis · Android (Google) Code Review · commit a1dee3f500ec · 2011-12-12T14:10:04.000-08:00
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
@@ -498,8 +498,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;
 }

Original file line number	Diff line number	Diff line change
`@@ -498,8 +498,8 @@ status_t SurfaceTexture::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h,`
`498`	`498`	`eglDestroySyncKHR(dpy, fence);`
`499`	`499`	`}`
`500`	`500`
`501`		`- ST_LOGV("dequeueBuffer: returning slot=%d buf=%p flags=%#x", buf,`
`502`		`- mSlots[buf].mGraphicBuffer->handle, returnFlags);`
	`501`	`+ ST_LOGV("dequeueBuffer: returning slot=%d buf=%p flags=%#x", *outBuf,`
	`502`	`+ mSlots[*outBuf].mGraphicBuffer->handle, returnFlags);`
`503`	`503`
`504`	`504`	`return returnFlags;`
`505`	`505`	`}`