diff --git a/src/draw/sw/lv_draw_sw_vector.c b/src/draw/sw/lv_draw_sw_vector.c index 15d9c1ba4b..778ad63d30 100644 --- a/src/draw/sw/lv_draw_sw_vector.c +++ b/src/draw/sw/lv_draw_sw_vector.c @@ -430,6 +430,12 @@ void lv_draw_sw_vector(lv_draw_unit_t * draw_unit, const lv_draw_vector_task_dsc if(layer->buf == NULL) return; + if(layer->color_format != LV_COLOR_FORMAT_ARGB8888 && \ + layer->color_format != LV_COLOR_FORMAT_XRGB8888) { + LV_LOG_ERROR("unsupported layer color: %d", layer->color_format); + return; + } + void * buf = layer->buf; int32_t width = lv_area_get_width(&layer->buf_area); int32_t height = lv_area_get_height(&layer->buf_area); diff --git a/src/draw/vg_lite/lv_vg_lite_math.h b/src/draw/vg_lite/lv_vg_lite_math.h index 698f60685b..3e91e928e6 100644 --- a/src/draw/vg_lite/lv_vg_lite_math.h +++ b/src/draw/vg_lite/lv_vg_lite_math.h @@ -40,7 +40,7 @@ extern "C" { #define MATH_SQRTF(x) sqrtf(x) #define MATH_RADIANS(deg) ((deg) * DEG_TO_RAD) -#define MATD_DEGRESS(rad) ((rad) * RAD_TO_DEG) +#define MATH_DEGRESS(rad) ((rad) * RAD_TO_DEG) /********************** * TYPEDEFS diff --git a/src/draw/vg_lite/lv_vg_lite_path.c b/src/draw/vg_lite/lv_vg_lite_path.c index 19651729d8..5fd65aa4f3 100644 --- a/src/draw/vg_lite/lv_vg_lite_path.c +++ b/src/draw/vg_lite/lv_vg_lite_path.c @@ -444,8 +444,8 @@ void lv_vg_lite_path_append_arc(lv_vg_lite_path_t * path, return lv_vg_lite_path_append_circle(path, cx, cy, radius, radius); } - start_angle = (start_angle * MATH_PI) / 180.0f; - sweep = sweep * MATH_PI / 180.0f; + start_angle = MATH_RADIANS(start_angle); + sweep = MATH_RADIANS(sweep); int n_curves = ceil(MATH_FABSF(sweep / MATH_HALF_PI)); int sweep_sign = (sweep < 0 ? -1 : 1); diff --git a/src/draw/vg_lite/lv_vg_lite_utils.c b/src/draw/vg_lite/lv_vg_lite_utils.c index 18bc6cc8cb..5f2c415fb4 100644 --- a/src/draw/vg_lite/lv_vg_lite_utils.c +++ b/src/draw/vg_lite/lv_vg_lite_utils.c @@ -598,7 +598,7 @@ bool lv_vg_lite_buffer_open_image(vg_lite_buffer_t * buffer, lv_image_decoder_ds if(!lv_vg_lite_is_src_cf_supported(decoder_dsc->header.cf)) { lv_image_decoder_close(decoder_dsc); - LV_LOG_ERROR("unsupport color format: %d", decoder_dsc->header.cf); + LV_LOG_ERROR("unsupported color format: %d", decoder_dsc->header.cf); return false; }