From 784421160727c434c2a2897ed3345445fcc30f75 Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Thu, 7 Aug 2014 22:43:06 -0700 Subject: [PATCH] surfaceflinger: fix -Wsign-compare warnings warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned int') [-Wsign-compare] arning: comparison of integers of different signs: 'int32_t' (aka 'int') and 'const uint32_t' (aka 'const unsigned int') [-Wsign-compare] Change-Id: I823257aa7218c5fd492a3277853210db539bb2e2 (cherry picked from f9bfdc6c9449143eed674c03e15dd8278296d32b) --- services/surfaceflinger/SurfaceFlinger.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 17e984a1a..cc47e1668 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -653,7 +653,7 @@ status_t SurfaceFlinger::setActiveConfig(const sp& display, int mode) { virtual bool handler() { Vector configs; mFlinger.getDisplayConfigs(mDisplay, &configs); - if(mMode < 0 || mMode >= configs.size()) { + if (mMode < 0 || mMode >= static_cast(configs.size())) { ALOGE("Attempt to set active config = %d for display with %zu configs", mMode, configs.size()); } @@ -3104,13 +3104,13 @@ void SurfaceFlinger::renderScreenImplLocked( if (sourceCrop.left < 0) { ALOGE("Invalid crop rect: l = %d (< 0)", sourceCrop.left); } - if (sourceCrop.right > hw_w) { + if (static_cast(sourceCrop.right) > hw_w) { ALOGE("Invalid crop rect: r = %d (> %d)", sourceCrop.right, hw_w); } if (sourceCrop.top < 0) { ALOGE("Invalid crop rect: t = %d (< 0)", sourceCrop.top); } - if (sourceCrop.bottom > hw_h) { + if (static_cast(sourceCrop.bottom) > hw_h) { ALOGE("Invalid crop rect: b = %d (> %d)", sourceCrop.bottom, hw_h); }