From 9916253a6e08c102abe6125d484cde24dc260910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=B1=B3-=E9=BB=84=E9=BD=90?= <757509347@qq.com> Date: Fri, 17 Apr 2020 19:20:40 +0800 Subject: [PATCH] Fix build warnings (#1457) Signed-off-by: Huang Qi Change-Id: Iab6b1c9d64a865b16b6e39ddeaf7d7295ef74060 Co-authored-by: Huang Qi --- src/lv_draw/lv_draw_basic.c | 2 +- src/lv_objx/lv_img.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lv_draw/lv_draw_basic.c b/src/lv_draw/lv_draw_basic.c index 462e15224..875eb394b 100644 --- a/src/lv_draw/lv_draw_basic.c +++ b/src/lv_draw/lv_draw_basic.c @@ -530,7 +530,7 @@ void lv_draw_map(const lv_area_t * cords_p, const lv_area_t * mask_p, const uint else { for(row = masked_a.y1; row <= masked_a.y2; row++) { #if LV_USE_GPU - if(disp->driver.gpu_blend_cb == false) { + if(disp->driver.gpu_blend_cb == NULL) { sw_mem_blend(vdb_buf_tmp, (lv_color_t *)map_p, map_useful_w, opa); } else { disp->driver.gpu_blend_cb(&disp->driver, vdb_buf_tmp, (lv_color_t *)map_p, map_useful_w, opa); diff --git a/src/lv_objx/lv_img.c b/src/lv_objx/lv_img.c index bf0269f9e..02dc9b94c 100644 --- a/src/lv_objx/lv_img.c +++ b/src/lv_objx/lv_img.c @@ -355,8 +355,8 @@ static bool lv_img_design(lv_obj_t * img, const lv_area_t * mask, lv_design_mode if(ext->cf == LV_IMG_CF_TRUE_COLOR || ext->cf == LV_IMG_CF_RAW) cover = lv_area_is_in(mask, &img->coords); - const lv_style_t * style = lv_img_get_style(img, LV_IMG_STYLE_MAIN); - if(style->image.opa < LV_OPA_MAX) return false; + const lv_style_t * style_local = lv_img_get_style(img, LV_IMG_STYLE_MAIN); + if(style_local->image.opa < LV_OPA_MAX) return false; return cover; } else if(mode == LV_DESIGN_DRAW_MAIN) {