From fcfc634ea63e64f0b87dea05a753e2cd017c4972 Mon Sep 17 00:00:00 2001 From: Simon Shi Date: Wed, 16 Jan 2019 13:27:01 +0800 Subject: twrp: Fix unsigned compare compile warning. Change-Id: I7e847e76932a6ceea3e669e8b8b9ec35e5ef9d9d --- minui/graphics_overlay.cpp | 6 ++---- minuitwrp/graphics_fbdev.cpp | 6 ++---- minuitwrp/graphics_overlay.cpp | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/minui/graphics_overlay.cpp b/minui/graphics_overlay.cpp index b7e62d945..5988d70ad 100644 --- a/minui/graphics_overlay.cpp +++ b/minui/graphics_overlay.cpp @@ -448,12 +448,10 @@ GRSurface* MinuiBackendOverlay::Flip() { if (double_buffered) { #if defined(RECOVERY_BGRA) // In case of BGRA, do some byte swapping - unsigned int idx; - unsigned char tmp; unsigned char* ucfb_vaddr = (unsigned char*)gr_draw->data; - for (idx = 0 ; idx < (gr_draw->height * gr_draw->row_bytes); + for (int idx = 0 ; idx < (gr_draw->height * gr_draw->row_bytes); idx += 4) { - tmp = ucfb_vaddr[idx]; + unsigned char tmp = ucfb_vaddr[idx]; ucfb_vaddr[idx ] = ucfb_vaddr[idx + 2]; ucfb_vaddr[idx + 2] = tmp; } diff --git a/minuitwrp/graphics_fbdev.cpp b/minuitwrp/graphics_fbdev.cpp index a1c42d05c..8cf85f5eb 100644 --- a/minuitwrp/graphics_fbdev.cpp +++ b/minuitwrp/graphics_fbdev.cpp @@ -285,12 +285,10 @@ static GRSurface* fbdev_init(minui_backend* backend) { static GRSurface* fbdev_flip(minui_backend* backend __unused) { #if defined(RECOVERY_BGRA) // In case of BGRA, do some byte swapping - unsigned int idx; - unsigned char tmp; unsigned char* ucfb_vaddr = (unsigned char*)gr_draw->data; - for (idx = 0 ; idx < (gr_draw->height * gr_draw->row_bytes); + for (int idx = 0 ; idx < (gr_draw->height * gr_draw->row_bytes); idx += 4) { - tmp = ucfb_vaddr[idx]; + unsigned char tmp = ucfb_vaddr[idx]; ucfb_vaddr[idx ] = ucfb_vaddr[idx + 2]; ucfb_vaddr[idx + 2] = tmp; } diff --git a/minuitwrp/graphics_overlay.cpp b/minuitwrp/graphics_overlay.cpp index 84ea6e0ea..e4fc4191e 100644 --- a/minuitwrp/graphics_overlay.cpp +++ b/minuitwrp/graphics_overlay.cpp @@ -491,12 +491,10 @@ int overlay_display_frame(int fd, void* data, size_t size) static GRSurface* overlay_flip(minui_backend* backend __unused) { #if defined(RECOVERY_BGRA) // In case of BGRA, do some byte swapping - unsigned int idx; - unsigned char tmp; unsigned char* ucfb_vaddr = (unsigned char*)gr_draw->data; - for (idx = 0 ; idx < (gr_draw->height * gr_draw->row_bytes); + for (int idx = 0 ; idx < (gr_draw->height * gr_draw->row_bytes); idx += 4) { - tmp = ucfb_vaddr[idx]; + unsigned char tmp = ucfb_vaddr[idx]; ucfb_vaddr[idx ] = ucfb_vaddr[idx + 2]; ucfb_vaddr[idx + 2] = tmp; } -- cgit v1.2.3