Merge "frameworks/base: Swap width and height of temporary buffer only with orientation change"

Jean-Baptiste Queru · Android Code Review · commit bc881e66d151 · 2010-08-11T10:11:14.000-07:00
diff --git a/services/surfaceflinger/LayerBuffer.cpp b/services/surfaceflinger/LayerBuffer.cpp
@@ -540,7 +540,7 @@ status_t LayerBuffer::BufferSource::initTempBuffer() const
     const ISurface::BufferHeap& buffers(mBufferHeap);
     uint32_t w = mLayer.mTransformedBounds.width();
     uint32_t h = mLayer.mTransformedBounds.height();
-    if (buffers.w * h != buffers.h * w) {
+    if (mLayer.getOrientation() & (Transform::ROT_90 | Transform::ROT_270)) {
         int t = w; w = h; h = t;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,7 @@ status_t LayerBuffer::BufferSource::initTempBuffer() const`
`540`	`540`	`const ISurface::BufferHeap& buffers(mBufferHeap);`
`541`	`541`	`uint32_t w = mLayer.mTransformedBounds.width();`
`542`	`542`	`uint32_t h = mLayer.mTransformedBounds.height();`
`543`		`- if (buffers.w * h != buffers.h * w) {`
	`543`	`+ if (mLayer.getOrientation() & (Transform::ROT_90 \| Transform::ROT_270)) {`
`544`	`544`	`int t = w; w = h; h = t;`
`545`	`545`	`}`
`546`	`546`