diff --git a/src/draw/sw/lv_draw_sw_arc.c b/src/draw/sw/lv_draw_sw_arc.c index b6e77e8778..982200c461 100644 --- a/src/draw/sw/lv_draw_sw_arc.c +++ b/src/draw/sw/lv_draw_sw_arc.c @@ -306,9 +306,9 @@ static void get_rounded_area(int16_t angle, int32_t radius, uint8_t thickness, l #else /*LV_DRAW_SW_COMPLEX*/ -void lv_draw_sw_arc(lv_draw_unit_t * draw_unit, const lv_draw_arc_dsc_t * dsc, const lv_area_t * coords) +void lv_draw_sw_arc(lv_draw_task_t * t, const lv_draw_arc_dsc_t * dsc, const lv_area_t * coords) { - LV_UNUSED(draw_unit); + LV_UNUSED(t); LV_UNUSED(dsc); LV_UNUSED(coords); diff --git a/src/draw/sw/lv_draw_sw_border.c b/src/draw/sw/lv_draw_sw_border.c index 2b9f06c59a..f27f0c3483 100644 --- a/src/draw/sw/lv_draw_sw_border.c +++ b/src/draw/sw/lv_draw_sw_border.c @@ -283,6 +283,14 @@ void draw_border_complex(lv_draw_task_t * t, const lv_area_t * outer_area, const if(rout > 0) lv_draw_sw_mask_free_param(&mask_rout_param); lv_free(mask_buf); +#else + LV_UNUSED(t); + LV_UNUSED(outer_area); + LV_UNUSED(inner_area); + LV_UNUSED(rout); + LV_UNUSED(rin); + LV_UNUSED(color); + LV_UNUSED(opa); #endif /*LV_DRAW_SW_COMPLEX*/ } static void draw_border_simple(lv_draw_task_t * t, const lv_area_t * outer_area, const lv_area_t * inner_area, diff --git a/src/draw/sw/lv_draw_sw_box_shadow.c b/src/draw/sw/lv_draw_sw_box_shadow.c index c9fba4e926..ee693f5b6b 100644 --- a/src/draw/sw/lv_draw_sw_box_shadow.c +++ b/src/draw/sw/lv_draw_sw_box_shadow.c @@ -732,9 +732,9 @@ static void LV_ATTRIBUTE_FAST_MEM shadow_blur_corner(int32_t size, int32_t sw, u #else /*LV_DRAW_SW_COMPLEX*/ -void lv_draw_sw_box_shadow(lv_draw_unit_t * draw_unit, const lv_draw_box_shadow_dsc_t * dsc, const lv_area_t * coords) +void lv_draw_sw_box_shadow(lv_draw_task_t * t, const lv_draw_box_shadow_dsc_t * dsc, const lv_area_t * coords) { - LV_UNUSED(draw_unit); + LV_UNUSED(t); LV_UNUSED(dsc); LV_UNUSED(coords); diff --git a/src/draw/sw/lv_draw_sw_img.c b/src/draw/sw/lv_draw_sw_img.c index 3b2b281aa8..7012819a5b 100644 --- a/src/draw/sw/lv_draw_sw_img.c +++ b/src/draw/sw/lv_draw_sw_img.c @@ -64,9 +64,11 @@ static void img_draw_core(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_d const lv_area_t * img_coords, const lv_area_t * clipped_img_area); +#if LV_DRAW_SW_COMPLEX static void radius_only(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_dsc, const lv_image_decoder_dsc_t * decoder_dsc, const lv_area_t * img_coords, const lv_area_t * clipped_img_area); +#endif /*LV_DRAW_SW_COMPLEX*/ static void recolor_only(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_dsc, const lv_image_decoder_dsc_t * decoder_dsc, @@ -279,10 +281,12 @@ static void img_draw_core(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_d else if(!transformed && !radius && draw_dsc->recolor_opa > LV_OPA_MIN) { recolor_only(t, draw_dsc, decoder_dsc, img_coords, clipped_img_area); } +#if LV_DRAW_SW_COMPLEX /*Handle masked RGB565, RGB888, XRGB888, or ARGB8888 images*/ else if(!transformed && radius && draw_dsc->recolor_opa <= LV_OPA_MIN) { radius_only(t, draw_dsc, decoder_dsc, img_coords, clipped_img_area); } +#endif /*LV_DRAW_SW_COMPLEX*/ /* check whether it is possible to accelerate the operation in synchronous mode */ else if(LV_RESULT_INVALID == LV_DRAW_SW_IMAGE(transformed, /* whether require transform */ cf, /* image format */ @@ -297,6 +301,7 @@ static void img_draw_core(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_d } } +#if LV_DRAW_SW_COMPLEX static void radius_only(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_dsc, const lv_image_decoder_dsc_t * decoder_dsc, const lv_area_t * img_coords, const lv_area_t * clipped_img_area) @@ -376,6 +381,7 @@ static void radius_only(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_dsc lv_free(mask_buf); } +#endif /*LV_DRAW_SW_COMPLEX*/ static void recolor_only(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_dsc, const lv_image_decoder_dsc_t * decoder_dsc, const lv_area_t * img_coords, const lv_area_t * clipped_img_area) diff --git a/src/draw/sw/lv_draw_sw_line.c b/src/draw/sw/lv_draw_sw_line.c index 53a259759d..dbc4953d32 100644 --- a/src/draw/sw/lv_draw_sw_line.c +++ b/src/draw/sw/lv_draw_sw_line.c @@ -399,7 +399,7 @@ static void LV_ATTRIBUTE_FAST_MEM draw_line_skew(lv_draw_task_t * t, const lv_dr lv_draw_sw_mask_free_param(&mask_bottom_param); } #else - LV_UNUSED(draw_unit); + LV_UNUSED(t); LV_UNUSED(dsc); LV_LOG_WARN("Can't draw skewed line with LV_DRAW_SW_COMPLEX == 0"); #endif /*LV_DRAW_SW_COMPLEX*/ diff --git a/src/draw/sw/lv_draw_sw_triangle.c b/src/draw/sw/lv_draw_sw_triangle.c index 2adb4cb5e5..4179a75f73 100644 --- a/src/draw/sw/lv_draw_sw_triangle.c +++ b/src/draw/sw/lv_draw_sw_triangle.c @@ -189,7 +189,7 @@ void lv_draw_sw_triangle(lv_draw_task_t * t, const lv_draw_triangle_dsc_t * dsc) } #else - LV_UNUSED(draw_unit); + LV_UNUSED(t); LV_UNUSED(dsc); LV_LOG_WARN("Can't draw triangles with LV_DRAW_SW_COMPLEX == 0"); #endif /*LV_DRAW_SW_COMPLEX*/