diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-11 10:16:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-11 10:16:32 -0700 |
| commit | a59aaed81b47f59ee9ee724760c4c39fcf429a18 (patch) | |
| tree | ccf1c9dd45cd35ea85c1493abd3b094557398ac7 /services/surfaceflinger/LayerBuffer.cpp | |
| parent | f781b4ef4bd840b7cee83fafdf2e31e709068bd3 (diff) | |
| parent | bc881e66d15181494fdd5d0ece83e20ef325453b (diff) | |
| download | frameworks_base-a59aaed81b47f59ee9ee724760c4c39fcf429a18.zip frameworks_base-a59aaed81b47f59ee9ee724760c4c39fcf429a18.tar.gz frameworks_base-a59aaed81b47f59ee9ee724760c4c39fcf429a18.tar.bz2 | |
am bc881e66: Merge "frameworks/base: Swap width and height of temporary buffer only with orientation change"
Merge commit 'bc881e66d15181494fdd5d0ece83e20ef325453b' into gingerbread-plus-aosp
* commit 'bc881e66d15181494fdd5d0ece83e20ef325453b':
frameworks/base: Swap width and height of temporary buffer only with
Diffstat (limited to 'services/surfaceflinger/LayerBuffer.cpp')
| -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 5f83636..e8b2ebf 100644 --- a/services/surfaceflinger/LayerBuffer.cpp +++ b/services/surfaceflinger/LayerBuffer.cpp @@ -495,7 +495,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; } |