From bdd0acf53a0a6450cbb09d5eeca470b0cf0d4082 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Fri, 1 Nov 2019 11:14:04 +0100 Subject: [PATCH] fix conflicts --- src/lv_draw/lv_draw_img.c | 3 +-- src/lv_objx/lv_canvas.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lv_draw/lv_draw_img.c b/src/lv_draw/lv_draw_img.c index cf57f6dcf..8156f8bd9 100644 --- a/src/lv_draw/lv_draw_img.c +++ b/src/lv_draw/lv_draw_img.c @@ -666,8 +666,7 @@ static lv_res_t lv_img_draw_core(const lv_area_t * coords, const lv_area_t * mas /* The decoder open could open the image and gave the entire uncompressed image. * Just draw it!*/ else if(cdsc->dec_dsc.img_data) { - lv_draw_map(coords, mask, cdsc->dec_dsc.img_data, opa, chroma_keyed, alpha_byte, style->image.color, - style->image.intense); + lv_draw_map(coords, mask, cdsc->dec_dsc.img_data, opa, chroma_keyed, alpha_byte, style); } /* The whole uncompressed image is not available. Try to read it line-by-line*/ else { diff --git a/src/lv_objx/lv_canvas.c b/src/lv_objx/lv_canvas.c index aafae0b0a..73e0ea92f 100644 --- a/src/lv_objx/lv_canvas.c +++ b/src/lv_objx/lv_canvas.c @@ -30,7 +30,7 @@ static lv_res_t lv_canvas_signal(lv_obj_t * canvas, lv_signal_t sign, void * param); static void set_set_px_cb(lv_disp_drv_t * disp_drv, lv_img_cf_t cf); -static void set_px_true_color_alpa(lv_disp_drv_t * disp_drv, uint8_t * buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y, +static void set_px_true_color_alpha(lv_disp_drv_t * disp_drv, uint8_t * buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y, lv_color_t color, lv_opa_t opa); static void set_px_cb_alpha1(lv_disp_drv_t * disp_drv, uint8_t * buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y, @@ -828,7 +828,7 @@ static lv_res_t lv_canvas_signal(lv_obj_t * canvas, lv_signal_t sign, void * par static void set_set_px_cb(lv_disp_drv_t * disp_drv, lv_img_cf_t cf) { switch(cf) { - case LV_IMG_CF_TRUE_COLOR_ALPHA: disp_drv->set_px_cb = set_px_true_color_alpa; break; + case LV_IMG_CF_TRUE_COLOR_ALPHA: disp_drv->set_px_cb = set_px_true_color_alpha; break; case LV_IMG_CF_ALPHA_1BIT: disp_drv->set_px_cb = set_px_cb_alpha1; break; case LV_IMG_CF_ALPHA_2BIT: disp_drv->set_px_cb = set_px_cb_alpha2; break; case LV_IMG_CF_ALPHA_4BIT: disp_drv->set_px_cb = set_px_cb_alpha4; break; @@ -901,7 +901,7 @@ void set_px_alpha_generic(lv_img_dsc_t * d, lv_coord_t x, lv_coord_t y, lv_color } -static void set_px_true_color_alpa(lv_disp_drv_t * disp_drv, uint8_t * buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y, +static void set_px_true_color_alpha(lv_disp_drv_t * disp_drv, uint8_t * buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y, lv_color_t color, lv_opa_t opa) { if(opa <= LV_OPA_MIN) return; @@ -912,7 +912,7 @@ static void set_px_true_color_alpa(lv_disp_drv_t * disp_drv, uint8_t * buf, lv_c d.header.w = buf_w; d.header.cf = LV_IMG_CF_TRUE_COLOR_ALPHA; - lv_color_t bg_color = lv_img_buf_get_px_color(&d, x, y, &lv_style_plain); + lv_color_t bg_color = lv_img_buf_get_px_color(&d, x, y, LV_COLOR_BLACK); lv_opa_t bg_opa = lv_img_buf_get_px_alpha(&d, x, y); lv_opa_t res_opa;