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

Merge "surfaceflinger: fix -Wsign-compare warnings"

Browse Source
This commit is contained in:
Jesse Hall 2014-09-06 20:14:41 +00:00 committed by Android (Google) Code Review
commit 12aa86a4f1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -639,7 +639,7 @@ status_t SurfaceFlinger::setActiveConfig(const sp<IBinder>& display, int mode) {
virtual bool handler() { virtual bool handler() {
Vector<DisplayInfo> configs; Vector<DisplayInfo> configs;
mFlinger.getDisplayConfigs(mDisplay, &configs); mFlinger.getDisplayConfigs(mDisplay, &configs);
if(mMode < 0 || mMode >= configs.size()) { if (mMode < 0 || mMode >= static_cast<int>(configs.size())) {
ALOGE("Attempt to set active config = %d for display with %zu configs", ALOGE("Attempt to set active config = %d for display with %zu configs",
mMode, configs.size()); mMode, configs.size());
} }
@ -3047,13 +3047,13 @@ void SurfaceFlinger::renderScreenImplLocked(
if (sourceCrop.left < 0) { if (sourceCrop.left < 0) {
ALOGE("Invalid crop rect: l = %d (< 0)", sourceCrop.left); ALOGE("Invalid crop rect: l = %d (< 0)", sourceCrop.left);
} }
if (sourceCrop.right > hw_w) { if (static_cast<uint32_t>(sourceCrop.right) > hw_w) {
ALOGE("Invalid crop rect: r = %d (> %d)", sourceCrop.right, hw_w); ALOGE("Invalid crop rect: r = %d (> %d)", sourceCrop.right, hw_w);
} }
if (sourceCrop.top < 0) { if (sourceCrop.top < 0) {
ALOGE("Invalid crop rect: t = %d (< 0)", sourceCrop.top); ALOGE("Invalid crop rect: t = %d (< 0)", sourceCrop.top);
} }
if (sourceCrop.bottom > hw_h) { if (static_cast<uint32_t>(sourceCrop.bottom) > hw_h) {
ALOGE("Invalid crop rect: b = %d (> %d)", sourceCrop.bottom, hw_h); ALOGE("Invalid crop rect: b = %d (> %d)", sourceCrop.bottom, hw_h);
} }