From cb6e1e385edd44fbc68718e792b7180b1015d438 Mon Sep 17 00:00:00 2001 From: Robert Carr Date: Tue, 21 Feb 2017 19:48:26 -0800 Subject: SurfaceControl: Correct setMatrix parameter naming. The first parameter dsdx controls the X scaling. The last parameter is called dtdy but controls the Y scaling. Clearly this was meant to be named dsdy. You can verify this with a quick look at Transaction_test. Test: Tried various stuff, phone still works. Change-Id: Ie9e898443350ffdcf227888a8d85efdbe1b6b033 --- libs/gui/SurfaceComposerClient.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/gui/SurfaceComposerClient.cpp') diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index ae81c8fbd1..9e81a78e10 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -157,7 +157,7 @@ public: status_t setAlpha(const sp& client, const sp& id, float alpha); status_t setMatrix(const sp& client, const sp& id, - float dsdx, float dtdx, float dsdy, float dtdy); + float dsdx, float dtdx, float dtdy, float dsdy); status_t setOrientation(int orientation); status_t setCrop(const sp& client, const sp& id, const Rect& crop); @@ -392,7 +392,7 @@ status_t Composer::setLayerStack(const sp& client, status_t Composer::setMatrix(const sp& client, const sp& id, float dsdx, float dtdx, - float dsdy, float dtdy) { + float dtdy, float dsdy) { Mutex::Autolock _l(mLock); layer_state_t* s = getLayerStateLocked(client, id); if (!s) @@ -768,8 +768,8 @@ status_t SurfaceComposerClient::setLayerStack(const sp& id, uint32_t la } status_t SurfaceComposerClient::setMatrix(const sp& id, float dsdx, float dtdx, - float dsdy, float dtdy) { - return getComposer().setMatrix(this, id, dsdx, dtdx, dsdy, dtdy); + float dtdy, float dsdy) { + return getComposer().setMatrix(this, id, dsdx, dtdx, dtdy, dsdy); } status_t SurfaceComposerClient::deferTransactionUntil(const sp& id, -- cgit v1.2.3-59-g8ed1b