Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78442116 authored by Jesse Hall's avatar Jesse Hall
Browse files

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 f9bfdc6c)
parent 9b901805

services/surfaceflinger/SurfaceFlinger.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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());

            }
@@ -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<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);

    }