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

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
This commit is contained in:
Dan Stoza 2015-03-04 14:58:02 -08:00
parent c168b8a5a9
commit 2632350ac8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/gui/GLConsumer.cpp
View File

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