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

Commit 765511d8 authored by Dan Stoza's avatar Dan Stoza Committed by Android Git Automerger
Browse files

am 6cd8771c: Merge "GLConsumer: Fix crop math" into mnc-dev 

* commit '6cd8771c':
  GLConsumer: Fix crop math
parents 58996069 6cd8771c

libs/gui/GLConsumer.cpp

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


        // The crop is too wide

        if (newWidth < currentWidth) {

            uint32_t dw = (currentWidth - newWidth) / 2;

            outCrop.left += dw;

            outCrop.right -= dw;

            uint32_t dw = currentWidth - newWidth;

            auto halfdw = dw / 2;

            outCrop.left += halfdw;

            // Not halfdw because it would subtract 1 too few when dw is odd

            outCrop.right -= (dw - halfdw);

        // The crop is too tall

        } else if (newHeight < currentHeight) {

            uint32_t dh = (currentHeight - newHeight) / 2;

            outCrop.top += dh;

            outCrop.bottom -= dh;

            uint32_t dh = currentHeight - newHeight;

            auto halfdh = dh / 2;

            outCrop.top += halfdh;

            // Not halfdh because it would subtract 1 too few when dh is odd

            outCrop.bottom -= (dh - halfdh);

        }



        GLC_LOGV("getCurrentCrop final crop [%d,%d,%d,%d]",