commit 55466b48504f9a904c54f3cae4fc1a43dec73a6c
author Dan Stoza <stoza@google.com> Thu Mar 19 17:22:22 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 19 17:22:23 2015 +0000
tree 34d498264d342c8bbfdb23f8315640cc8f5e91ae
parent f87d1bcd65f1889b78a8f5db6526e91216eaeb5d
parent 2632350ac88cdf007c62e18345b71411755ed6ba

Merge "GLConsumer: Fix unsigned subtraction during crop"

libs/gui/GLConsumer.cpp

diff --git a/libs/gui/GLConsumer.cpp b/libs/gui/GLConsumer.cpp
index 065345c..a0f68b4 100644
--- a/libs/gui/GLConsumer.cpp
+++ b/libs/gui/GLConsumer.cpp
@@ -899,14 +899,14 @@
 
         // The crop is too wide
         if (newWidth < currentWidth) {
-            uint32_t dw = (newWidth - currentWidth) / 2;
-            outCrop.left -=dw;
-            outCrop.right += dw;
+            uint32_t dw = (currentWidth - newWidth) / 2;
+            outCrop.left += dw;
+            outCrop.right -= dw;
         // The crop is too tall
         } else if (newHeight < currentHeight) {
-            uint32_t dh = (newHeight - currentHeight) / 2;
-            outCrop.top -= dh;
-            outCrop.bottom += dh;
+            uint32_t dh = (currentHeight - newHeight) / 2;
+            outCrop.top += dh;
+            outCrop.bottom -= dh;
         }
 
         GLC_LOGV("getCurrentCrop final crop [%d,%d,%d,%d]",