github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(draw_sw_fill): add NULL checks on grad (#7355)

Browse Source
This commit is contained in:
Paul Vogel
2024-12-03 05:58:50 -06:00
committed by GitHub
parent 20b00ef65d
commit 6e0389da46
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/draw/sw/lv_draw_sw_fill.c
View File

@@ -127,6 +127,7 @@ void lv_draw_sw_fill(lv_draw_unit_t * draw_unit, lv_draw_fill_dsc_t * dsc, const
/*Prepare complex gradient*/ /*Prepare complex gradient*/
if(grad_dir >= LV_GRAD_DIR_LINEAR) { if(grad_dir >= LV_GRAD_DIR_LINEAR) {
LV_ASSERT_NULL(grad);
switch(grad_dir) { switch(grad_dir) {
case LV_GRAD_DIR_LINEAR: case LV_GRAD_DIR_LINEAR:
lv_gradient_linear_setup(&dsc->grad, coords); lv_gradient_linear_setup(&dsc->grad, coords);
@@ -169,6 +170,7 @@ void lv_draw_sw_fill(lv_draw_unit_t * draw_unit, lv_draw_fill_dsc_t * dsc, const
switch(grad_dir) { switch(grad_dir) {
case LV_GRAD_DIR_VER: case LV_GRAD_DIR_VER:
LV_ASSERT_NULL(grad);
blend_dsc.color = grad->color_map[top_y - bg_coords.y1]; blend_dsc.color = grad->color_map[top_y - bg_coords.y1];
blend_dsc.opa = grad->opa_map[top_y - bg_coords.y1]; blend_dsc.opa = grad->opa_map[top_y - bg_coords.y1];
break; break;
@@ -210,6 +212,7 @@ void lv_draw_sw_fill(lv_draw_unit_t * draw_unit, lv_draw_fill_dsc_t * dsc, const
switch(grad_dir) { switch(grad_dir) {
case LV_GRAD_DIR_VER: case LV_GRAD_DIR_VER:
LV_ASSERT_NULL(grad);
blend_dsc.color = grad->color_map[bottom_y - bg_coords.y1]; blend_dsc.color = grad->color_map[bottom_y - bg_coords.y1];
blend_dsc.opa = grad->opa_map[bottom_y - bg_coords.y1]; blend_dsc.opa = grad->opa_map[bottom_y - bg_coords.y1];
break; break;
@@ -277,6 +280,7 @@ void lv_draw_sw_fill(lv_draw_unit_t * draw_unit, lv_draw_fill_dsc_t * dsc, const
case LV_GRAD_DIR_CONICAL: case LV_GRAD_DIR_CONICAL:
blend_dsc.mask_res = transp ? LV_DRAW_SW_MASK_RES_CHANGED : LV_DRAW_SW_MASK_RES_FULL_COVER; blend_dsc.mask_res = transp ? LV_DRAW_SW_MASK_RES_CHANGED : LV_DRAW_SW_MASK_RES_FULL_COVER;
blend_dsc.mask_buf = grad_opa_map; blend_dsc.mask_buf = grad_opa_map;
break;
default: default:
break; break;
} }
@@ -289,6 +293,7 @@ void lv_draw_sw_fill(lv_draw_unit_t * draw_unit, lv_draw_fill_dsc_t * dsc, const
switch(grad_dir) { switch(grad_dir) {
case LV_GRAD_DIR_VER: case LV_GRAD_DIR_VER:
LV_ASSERT_NULL(grad);
blend_dsc.color = grad->color_map[h - bg_coords.y1]; blend_dsc.color = grad->color_map[h - bg_coords.y1];
if(opa >= LV_OPA_MAX) blend_dsc.opa = grad->opa_map[h - bg_coords.y1]; if(opa >= LV_OPA_MAX) blend_dsc.opa = grad->opa_map[h - bg_coords.y1];
else blend_dsc.opa = LV_OPA_MIX2(grad->opa_map[h - bg_coords.y1], opa); else blend_dsc.opa = LV_OPA_MIX2(grad->opa_map[h - bg_coords.y1], opa);