commit 8b30c364ebff1b467c288b5fd3451401b6cc12d1
author Rob Carr <racarr@google.com> Mon Apr 29 19:51:54 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 29 19:51:54 2019 +0000
tree eb6c6388d481a0cbb54794d1cfde02d39b4c2a91
parent bb7f8aa0731a9954c8c1809ecab7e744d3c60cf5
parent 66365e40f39e081672e50f5cbab83316b2246481

Merge "Transaction::setGeometry: Handle invalid src rect correctly" into qt-dev

libs/gui/SurfaceComposerClient.cpp

diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 2083a2b..437cdd7 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -1149,8 +1149,12 @@
 
     int x = dst.left;
     int y = dst.top;
-    float xScale = dst.getWidth() / static_cast<float>(source.getWidth());
-    float yScale = dst.getHeight() / static_cast<float>(source.getHeight());
+
+    float sourceWidth = source.getWidth();
+    float sourceHeight = source.getHeight();
+
+    float xScale = sourceWidth < 0 ? 1.0f : dst.getWidth() / sourceWidth;
+    float yScale = sourceHeight < 0 ? 1.0f : dst.getHeight() / sourceHeight;
     float matrix[4] = {1, 0, 0, 1};
 
     switch (transform) {