From c804fadf40daea641ca8fce5a45e6bf3d088a40c Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Wed, 7 Oct 2020 13:55:06 +0200 Subject: [PATCH] remove the internal usage of LV_HOR/VER_RES_MAX --- src/lv_draw/lv_draw_img.c | 6 ++++-- src/lv_draw/lv_draw_label.c | 3 ++- src/lv_draw/lv_draw_line.c | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/lv_draw/lv_draw_img.c b/src/lv_draw/lv_draw_img.c index 4b736951a..1a12fe4ce 100644 --- a/src/lv_draw/lv_draw_img.c +++ b/src/lv_draw/lv_draw_img.c @@ -419,7 +419,8 @@ LV_ATTRIBUTE_FAST_MEM static void lv_draw_map(const lv_area_t * map_area, const return; } #endif - uint32_t mask_buf_size = lv_area_get_size(&draw_area) > LV_HOR_RES_MAX ? LV_HOR_RES_MAX : lv_area_get_size(&draw_area); + lv_coord_t hor_res_max = lv_disp_get_hor_res(disp); + uint32_t mask_buf_size = lv_area_get_size(&draw_area) > hor_res_max ? hor_res_max : lv_area_get_size(&draw_area); lv_color_t * map2 = _lv_mem_buf_get(mask_buf_size * sizeof(lv_color_t)); lv_opa_t * mask_buf = _lv_mem_buf_get(mask_buf_size); @@ -469,7 +470,8 @@ LV_ATTRIBUTE_FAST_MEM static void lv_draw_map(const lv_area_t * map_area, const /*Most complicated case: transform or other mask or chroma keyed*/ else { /*Build the image and a mask line-by-line*/ - uint32_t mask_buf_size = lv_area_get_size(&draw_area) > LV_HOR_RES_MAX ? LV_HOR_RES_MAX : lv_area_get_size(&draw_area); + lv_coord_t hor_res_max = lv_disp_get_hor_res(disp); + uint32_t mask_buf_size = lv_area_get_size(&draw_area) > hor_res_max ? hor_res_max : lv_area_get_size(&draw_area); lv_color_t * map2 = _lv_mem_buf_get(mask_buf_size * sizeof(lv_color_t)); lv_opa_t * mask_buf = _lv_mem_buf_get(mask_buf_size); diff --git a/src/lv_draw/lv_draw_label.c b/src/lv_draw/lv_draw_label.c index abea298ff..c57848ebd 100644 --- a/src/lv_draw/lv_draw_label.c +++ b/src/lv_draw/lv_draw_label.c @@ -524,7 +524,8 @@ LV_ATTRIBUTE_FAST_MEM static void draw_letter_normal(lv_coord_t pos_x, lv_coord_ uint32_t col_bit; col_bit = bit_ofs & 0x7; /* "& 0x7" equals to "% 8" just faster */ - uint32_t mask_buf_size = box_w * box_h > LV_HOR_RES_MAX ? LV_HOR_RES_MAX : box_w * box_h; + lv_coord_t hor_res = lv_disp_get_hor_res(_lv_refr_get_disp_refreshing()); + uint32_t mask_buf_size = box_w * box_h > hor_res ? hor_res : box_w * box_h; lv_opa_t * mask_buf = _lv_mem_buf_get(mask_buf_size); int32_t mask_p = 0; diff --git a/src/lv_draw/lv_draw_line.c b/src/lv_draw/lv_draw_line.c index 38e29cdfb..b3c385d2f 100644 --- a/src/lv_draw/lv_draw_line.c +++ b/src/lv_draw/lv_draw_line.c @@ -424,7 +424,8 @@ LV_ATTRIBUTE_FAST_MEM static void draw_line_skew(const lv_point_t * point1, cons /*Draw the background line by line*/ int32_t h; - size_t mask_buf_size = LV_MATH_MIN(lv_area_get_size(&draw_area), LV_HOR_RES_MAX); + lv_coord_t hor_res = lv_disp_get_hor_res(disp); + size_t mask_buf_size = LV_MATH_MIN(lv_area_get_size(&draw_area), hor_res); lv_opa_t * mask_buf = _lv_mem_buf_get(mask_buf_size); lv_area_t fill_area;