From 4a58f6d29073ea826cd8705eb7101b54640a6e3d Mon Sep 17 00:00:00 2001 From: _VIFEXTech Date: Tue, 19 Dec 2023 13:18:43 +0800 Subject: [PATCH] fix(vg_lite): fix build break (#5048) Signed-off-by: pengyiqiang Co-authored-by: pengyiqiang --- src/draw/vg_lite/lv_draw_buf_vg_lite.c | 13 ------------- src/draw/vg_lite/lv_draw_vg_lite_label.c | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/draw/vg_lite/lv_draw_buf_vg_lite.c b/src/draw/vg_lite/lv_draw_buf_vg_lite.c index fd756e9a4..86c41dfaf 100644 --- a/src/draw/vg_lite/lv_draw_buf_vg_lite.c +++ b/src/draw/vg_lite/lv_draw_buf_vg_lite.c @@ -31,8 +31,6 @@ static void buf_free(void * buf); static void * buf_align(void * buf, lv_color_format_t color_format); static void invalidate_cache(void * buf, uint32_t stride, lv_color_format_t color_format, const lv_area_t * area); static uint32_t width_to_stride(uint32_t w, lv_color_format_t color_format); -static void * buf_go_to_xy(const void * buf, uint32_t stride, lv_color_format_t color_format, int32_t x, - int32_t y); static void buf_clear(void * buf, uint32_t w, uint32_t h, lv_color_format_t color_format, const lv_area_t * a); static void buf_copy(void * dest_buf, uint32_t dest_w, uint32_t dest_h, const lv_area_t * dest_area_to_copy, void * src_buf, uint32_t src_w, uint32_t src_h, const lv_area_t * src_area_to_copy, @@ -59,7 +57,6 @@ void lv_draw_buf_vg_lite_init_handlers(void) handlers->align_pointer_cb = buf_align; handlers->invalidate_cache_cb = invalidate_cache; handlers->width_to_stride_cb = width_to_stride; - handlers->go_to_xy_cb = buf_go_to_xy; handlers->buf_clear_cb = buf_clear; handlers->buf_copy_cb = buf_copy; } @@ -95,16 +92,6 @@ static uint32_t width_to_stride(uint32_t w, lv_color_format_t color_format) return lv_vg_lite_width_to_stride(w, lv_vg_lite_vg_fmt(color_format)); } -static void * buf_go_to_xy(const void * buf, uint32_t stride, lv_color_format_t color_format, int32_t x, - int32_t y) -{ - const uint8_t * buf_tmp = buf; - buf_tmp += stride * y; - buf_tmp += x * lv_color_format_get_size(color_format); - - return (void *)buf_tmp; -} - static void buf_clear(void * buf, uint32_t w, uint32_t h, lv_color_format_t color_format, const lv_area_t * a) { #if 0 diff --git a/src/draw/vg_lite/lv_draw_vg_lite_label.c b/src/draw/vg_lite/lv_draw_vg_lite_label.c index ef7e64a3c..231d0043c 100644 --- a/src/draw/vg_lite/lv_draw_vg_lite_label.c +++ b/src/draw/vg_lite/lv_draw_vg_lite_label.c @@ -77,7 +77,7 @@ void lv_draw_vg_lite_label(lv_draw_unit_t * draw_unit, const lv_draw_label_dsc_t } #endif /*SUPPORT_OUTLINE_FONT*/ - lv_draw_label_iterate_letters(draw_unit, dsc, coords, draw_letter_cb); + lv_draw_label_iterate_characters(draw_unit, dsc, coords, draw_letter_cb); } /**********************