diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-27 23:46:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-27 23:46:25 -0700 |
| commit | 5c0efef9a15595fb855595b917ae6c3bcf216f78 (patch) | |
| tree | 5db74b5f6a946ff518e67316f6d3c9a0568cc8e7 /services/surfaceflinger/LayerBuffer.cpp | |
| parent | 70a68f9544426fa47ba7284d80a95807e820e17a (diff) | |
| parent | 7d452f693f06dfa4ad6a26a51ce03edf60107e8c (diff) | |
| download | frameworks_base-5c0efef9a15595fb855595b917ae6c3bcf216f78.zip frameworks_base-5c0efef9a15595fb855595b917ae6c3bcf216f78.tar.gz frameworks_base-5c0efef9a15595fb855595b917ae6c3bcf216f78.tar.bz2 | |
am 7d452f69: Merge "really fix [3118445] Transform * Transform does not work as expected" into gingerbread
Diffstat (limited to 'services/surfaceflinger/LayerBuffer.cpp')
| -rw-r--r-- | services/surfaceflinger/LayerBuffer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/LayerBuffer.cpp b/services/surfaceflinger/LayerBuffer.cpp index b7f9481..23506cf 100644 --- a/services/surfaceflinger/LayerBuffer.cpp +++ b/services/surfaceflinger/LayerBuffer.cpp @@ -676,8 +676,8 @@ void LayerBuffer::OverlaySource::onVisibilityResolved( overlay_dev->setPosition(overlay_dev, mOverlay, x,y,w,h); // we need to combine the layer orientation and the // user-requested orientation. - Transform finalTransform = Transform(mOrientation) * - Transform(mLayer.getOrientation()); + Transform finalTransform(Transform(mLayer.getOrientation()) * + Transform(mOrientation)); overlay_dev->setParameter(overlay_dev, mOverlay, OVERLAY_TRANSFORM, finalTransform.getOrientation()); overlay_dev->commit(overlay_dev, mOverlay); |