diff options
| author | Jesse Hall <jessehall@google.com> | 2014-10-31 22:57:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 22:57:43 +0000 |
| commit | 18b846dda798709796be078a7978d885685df9a4 (patch) | |
| tree | 510100692627999fcf53ae03932743fb6f2aada0 /services/surfaceflinger | |
| parent | 9fc06c5e2131cdf0d76a3838215c057f57da67e3 (diff) | |
| parent | c7636f606270a4b79d745ec1acf049daedfa0e2f (diff) | |
| download | frameworks_native-18b846dda798709796be078a7978d885685df9a4.zip frameworks_native-18b846dda798709796be078a7978d885685df9a4.tar.gz frameworks_native-18b846dda798709796be078a7978d885685df9a4.tar.bz2 | |
am c7636f60: Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev
* commit 'c7636f606270a4b79d745ec1acf049daedfa0e2f':
surfaceflinger: fix -Wsign-compare warnings
Diffstat (limited to 'services/surfaceflinger')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index a19c4df..0645a86 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -653,7 +653,7 @@ status_t SurfaceFlinger::setActiveConfig(const sp<IBinder>& display, int mode) { virtual bool handler() { Vector<DisplayInfo> 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", mMode, configs.size()); } @@ -3108,13 +3108,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<uint32_t>(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<uint32_t>(sourceCrop.bottom) > hw_h) { ALOGE("Invalid crop rect: b = %d (> %d)", sourceCrop.bottom, hw_h); } |