Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

lv_draw_line: fix crash with masks

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2020-03-04 12:08:56 +01:00
parent 1b3d1fcb8e
commit f9fa0add86
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lv_draw/lv_draw_line.c
View File

@ -170,7 +170,10 @@ static void draw_line_hor(const lv_point_t * point1, const lv_point_t * point2,
fill_area.y1 = draw_area.y1 + disp_area->y1; fill_area.y1 = draw_area.y1 + disp_area->y1;
fill_area.y2 = fill_area.y1; fill_area.y2 = fill_area.y1;
lv_style_int_t dash_start = (vdb->area.x1 + draw_area.x1) % (dsc->dash_gap + dsc->dash_width); lv_style_int_t dash_start = 0;
if(dashed) {
dash_start = (vdb->area.x1 + draw_area.x1) % (dsc->dash_gap + dsc->dash_width);
}
lv_opa_t * mask_buf = lv_mem_buf_get(draw_area_w); lv_opa_t * mask_buf = lv_mem_buf_get(draw_area_w);
int32_t h; int32_t h;
@ -269,7 +272,11 @@ static void draw_line_ver(const lv_point_t * point1, const lv_point_t * point2,
lv_opa_t * mask_buf = lv_mem_buf_get(draw_area_w); lv_opa_t * mask_buf = lv_mem_buf_get(draw_area_w);
lv_style_int_t dash_start = (vdb->area.y1 + draw_area.y1) % (dsc->dash_gap + dsc->dash_width); lv_style_int_t dash_start = 0;
if(dashed) {
dash_start = (vdb->area.x1 + draw_area.x1) % (dsc->dash_gap + dsc->dash_width);
}
lv_style_int_t dash_cnt = dash_start; lv_style_int_t dash_cnt = dash_start;
int32_t h; int32_t h;