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

am 55466b48: Merge "GLConsumer: Fix unsigned subtraction during crop"

Browse Source 
* commit '55466b48504f9a904c54f3cae4fc1a43dec73a6c':
  GLConsumer: Fix unsigned subtraction during crop
This commit is contained in:
Dan Stoza 2015-03-19 17:36:49 +00:00 committed by Android Git Automerger
commit 5bebe7e14d
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]",