Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2632350a authored by Dan Stoza's avatar Dan Stoza
Browse files

GLConsumer: Fix unsigned subtraction during crop 

Since some variables had been switched from signed to unsigned, there
was a section of code that was guaranteed to be incorrect because it
effectively did 'if (a < b) { c = a - b; }'. This change fixes it.

Cherry pick of I9cdd6c9a0179801addebb5d6dc1fbaddf8f53c62

Bug: 19346631
Change-Id: Id13a46f74c9ae7278463ce22b586f4dc21b5e453
parent c168b8a5

libs/gui/GLConsumer.cpp

+6 −6
Original line number Diff line number Diff line
@@ -899,14 +899,14 @@ Rect GLConsumer::getCurrentCrop() const { 


        // 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]",