diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-11 10:11:14 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2010-08-11 10:11:14 -0700 |
commit | bc881e66d15181494fdd5d0ece83e20ef325453b (patch) | |
tree | 4891f70df8302f5e7588168dc744849094d2a5f0 | |
parent | e37ab63221af94d69437741a3645fc0e14a680bc (diff) | |
parent | 92bd90de145bb377d591217690d1fc096c19c047 (diff) | |
download | frameworks_base-bc881e66d15181494fdd5d0ece83e20ef325453b.zip frameworks_base-bc881e66d15181494fdd5d0ece83e20ef325453b.tar.gz frameworks_base-bc881e66d15181494fdd5d0ece83e20ef325453b.tar.bz2 |
Merge "frameworks/base: Swap width and height of temporary buffer only with orientation change"
-rw-r--r-- | services/surfaceflinger/LayerBuffer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/LayerBuffer.cpp b/services/surfaceflinger/LayerBuffer.cpp index 5c21593..0869283 100644 --- 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; } |