ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "GLConsumer: Fix crop math" into mnc-dev

This commit is contained in:
Dan Stoza 2015-06-11 17:12:49 +00:00 committed by Android (Google) Code Review
parent 8a4222a647 ec4cb38750
commit 6cd8771c9c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/gui/GLConsumer.cpp
View File

@ -901,14 +901,18 @@ Rect GLConsumer::getCurrentCrop() const {
// The crop is too wide // The crop is too wide
if (newWidth < currentWidth) { if (newWidth < currentWidth) {
uint32_t dw = (currentWidth - newWidth) / 2; uint32_t dw = currentWidth - newWidth;
outCrop.left += dw; auto halfdw = dw / 2;
outCrop.right -= dw; 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 // The crop is too tall
} else if (newHeight < currentHeight) { } else if (newHeight < currentHeight) {
uint32_t dh = (currentHeight - newHeight) / 2; uint32_t dh = currentHeight - newHeight;
outCrop.top += dh; auto halfdh = dh / 2;
outCrop.bottom -= dh; 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]", GLC_LOGV("getCurrentCrop final crop [%d,%d,%d,%d]",