From 0835e0584a1134136c4e6480bf3627c8c105563b Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Sun, 23 Sep 2018 21:54:55 +0200 Subject: [PATCH] fix warnings --- lv_core/lv_refr.c | 4 ++-- lv_draw/lv_draw.c | 16 ++++++++-------- lv_draw/lv_draw.h | 8 ++++---- lv_draw/lv_draw_img.c | 1 + lv_draw/lv_draw_label.c | 1 + lv_draw/lv_draw_line.c | 19 ++++++++++++------- lv_objx/lv_img.c | 2 +- lv_objx/lv_imgbtn.c | 6 +++--- lv_objx/lv_imgbtn.h | 2 +- 9 files changed, 33 insertions(+), 26 deletions(-) diff --git a/lv_core/lv_refr.c b/lv_core/lv_refr.c index d91503019..c4bb098f1 100644 --- a/lv_core/lv_refr.c +++ b/lv_core/lv_refr.c @@ -284,8 +284,8 @@ static void lv_refr_area_no_vdb(const lv_area_t * area_p) lv_refr_obj_and_children(top_p, area_p); /*Also refresh top and sys layer unconditionally*/ - lv_refr_obj_and_children(lv_layer_top(), &start_mask); - lv_refr_obj_and_children(lv_layer_sys(), &start_mask); + lv_refr_obj_and_children(lv_layer_top(), area_p); + lv_refr_obj_and_children(lv_layer_sys(), area_p); } #else diff --git a/lv_draw/lv_draw.c b/lv_draw/lv_draw.c index 913e968ca..a61eb3a63 100644 --- a/lv_draw/lv_draw.c +++ b/lv_draw/lv_draw.c @@ -34,17 +34,17 @@ **********************/ #if LV_VDB_SIZE != 0 -const void (*px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_vpx; -const void (*fill_fp)(const lv_area_t * coords, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_vfill; -const void (*letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa) = lv_vletter; -const void (*map_fp)(const lv_area_t * cords_p, const lv_area_t * mask_p, +void (*const px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_vpx; +void (*const fill_fp)(const lv_area_t * coords, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_vfill; +void (*const letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa) = lv_vletter; +void (*const map_fp)(const lv_area_t * cords_p, const lv_area_t * mask_p, const uint8_t * map_p, lv_opa_t opa, bool chroma_key, bool alpha_byte, lv_color_t recolor, lv_opa_t recolor_opa) = lv_vmap; #else -const void (*px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_rpx; -const void (*fill_fp)(const lv_area_t * coords, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_rfill; -const void (*letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa) = lv_rletter; -const void (*map_fp)(const lv_area_t * cords_p, const lv_area_t * mask_p, +void (*const px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_rpx; +void (*const fill_fp)(const lv_area_t * coords, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_rfill; +void (*const letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa) = lv_rletter; +void (*const map_fp)(const lv_area_t * cords_p, const lv_area_t * mask_p, const uint8_t * map_p, lv_opa_t opa, bool chroma_key, bool alpha_byte, lv_color_t recolor, lv_opa_t recolor_opa) = lv_rmap; #endif diff --git a/lv_draw/lv_draw.h b/lv_draw/lv_draw.h index 04155cea0..d6e327cb6 100644 --- a/lv_draw/lv_draw.h +++ b/lv_draw/lv_draw.h @@ -88,10 +88,10 @@ void lv_draw_aa_hor_seg(lv_coord_t x, lv_coord_t y, lv_coord_t length, const lv_ /********************** * GLOBAL VARIABLES **********************/ -extern const void (*px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa); -extern const void (*fill_fp)(const lv_area_t * coords, const lv_area_t * mask, lv_color_t color, lv_opa_t opa); -extern const void (*letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa); -extern const void (*map_fp)(const lv_area_t * cords_p, const lv_area_t * mask_p, +extern void (*const px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa); +extern void (*const fill_fp)(const lv_area_t * coords, const lv_area_t * mask, lv_color_t color, lv_opa_t opa); +extern void (*const letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa); +extern void (*const map_fp)(const lv_area_t * cords_p, const lv_area_t * mask_p, const uint8_t * map_p, lv_opa_t opa, bool chroma_key, bool alpha_byte, lv_color_t recolor, lv_opa_t recolor_opa); diff --git a/lv_draw/lv_draw_img.c b/lv_draw/lv_draw_img.c index 2d48dcc80..ca05845e9 100644 --- a/lv_draw/lv_draw_img.c +++ b/lv_draw/lv_draw_img.c @@ -233,6 +233,7 @@ lv_img_src_t lv_img_src_get_type(const void * src) return LV_IMG_SRC_VARIABLE; /*`lv_img_dsc_t` is design to the first byte < 0x20*/ } + LV_LOG_WARN("lv_img_src_get_type: unknown image type"); return LV_IMG_SRC_UNKNOWN; } diff --git a/lv_draw/lv_draw_label.c b/lv_draw/lv_draw_label.c index 79b0ad1cb..a7979113e 100644 --- a/lv_draw/lv_draw_label.c +++ b/lv_draw/lv_draw_label.c @@ -7,6 +7,7 @@ * INCLUDES *********************/ #include "lv_draw_label.h" +#include "lv_draw_rbasic.h" #include "../lv_misc/lv_math.h" /********************* diff --git a/lv_draw/lv_draw_line.c b/lv_draw/lv_draw_line.c index efdfc5fea..c1882053c 100644 --- a/lv_draw/lv_draw_line.c +++ b/lv_draw/lv_draw_line.c @@ -182,11 +182,7 @@ static void line_draw_ver(line_draw_t * line, const lv_area_t * mask, const lv_s static void line_draw_skew(line_draw_t * main_line, const lv_area_t * mask, const lv_style_t * style, lv_opa_t opa_scale) { - lv_coord_t width; - width = style->line.width; -#if LV_ANTIALIAS - lv_coord_t width_safe = width; /*`width_safe` is always >=1*/ -#endif + lv_opa_t opa = opa_scale == LV_OPA_COVER ? style->line.opa : (uint16_t)((uint16_t) style->line.opa * opa_scale) >> 8; lv_point_t vect_main, vect_norm; @@ -216,8 +212,16 @@ static void line_draw_skew(line_draw_t * main_line, const lv_area_t * mask, cons vect_norm.x = vect_norm.x << 4; vect_norm.y = vect_norm.y << 4; + lv_coord_t width; + width = style->line.width; +#if LV_ANTIALIAS + lv_coord_t width_safe; /*`width_safe` is always >=1*/ +#endif + + /* The pattern stores the points of the line ending. It has the good direction and length. + * The worth case is the 45° line where pattern can have 1.41 x `width` points*/ #if LV_COMPILER_VLA_SUPPORTED - lv_point_t pattern[width_safe]; + lv_point_t pattern[width * 2]; #else lv_point_t pattern[LINE_MAX_WIDTH]; #endif @@ -230,7 +234,8 @@ static void line_draw_skew(line_draw_t * main_line, const lv_area_t * mask, cons line_init(&pattern_line, &p0, &vect_norm); uint32_t width_sqr = width * width; - for(i = 0; i < width * 2; i ++) { /*Run until a big number. Meanwhile the real width will be determined as well*/ + /* Run for a lot of times. Meanwhile the real width will be determined as well */ + for(i = 0; i < sizeof(pattern); i ++) { pattern[i].x = pattern_line.p_act.x; pattern[i].y = pattern_line.p_act.y; diff --git a/lv_objx/lv_img.c b/lv_objx/lv_img.c index 1e3501d24..061bde12c 100644 --- a/lv_objx/lv_img.c +++ b/lv_objx/lv_img.c @@ -88,7 +88,7 @@ lv_obj_t * lv_img_create(lv_obj_t * par, const lv_obj_t * copy) * and must be screen sized*/ if(par != NULL) { ext->auto_size = 1; - lv_obj_set_style(new_img, &lv_style_plain); /*Inherit the style by default*/ + lv_obj_set_style(new_img, NULL); /*Inherit the style by default*/ } else { ext->auto_size = 0; lv_obj_set_style(new_img, &lv_style_plain); /*Set a style for screens*/ diff --git a/lv_objx/lv_imgbtn.c b/lv_objx/lv_imgbtn.c index 0dc684208..b156a30a5 100644 --- a/lv_objx/lv_imgbtn.c +++ b/lv_objx/lv_imgbtn.c @@ -134,7 +134,7 @@ void lv_imgbtn_set_style(lv_obj_t * imgbtn, lv_imgbtn_style_t type, lv_style_t * * @param state the state where to get the image (from `lv_btn_state_t`) ` * @return pointer to an image source (a C array or path to a file) */ -void * lv_imgbtn_get_src(lv_obj_t * imgbtn, lv_btn_state_t state) +const void * lv_imgbtn_get_src(lv_obj_t * imgbtn, lv_btn_state_t state) { lv_imgbtn_ext_t * ext = lv_obj_get_ext_attr(imgbtn); @@ -191,7 +191,7 @@ static bool lv_imgbtn_design(lv_obj_t * imgbtn, const lv_area_t * mask, lv_desig /*Just draw an image*/ lv_imgbtn_ext_t * ext = lv_obj_get_ext_attr(imgbtn); lv_btn_state_t state = lv_imgbtn_get_state(imgbtn); - void * src = ext->img_src[state]; + const void * src = ext->img_src[state]; lv_style_t * style = lv_imgbtn_get_style(imgbtn, state); lv_opa_t opa_scale = lv_obj_get_opa_scale(imgbtn); lv_draw_img(&imgbtn->coords, mask, src, style, opa_scale); @@ -244,7 +244,7 @@ static void refr_img(lv_obj_t * imgbtn) lv_imgbtn_ext_t * ext = lv_obj_get_ext_attr(imgbtn); lv_btn_state_t state = lv_imgbtn_get_state(imgbtn); lv_img_header_t header; - void * src = ext->img_src[state]; + const void * src = ext->img_src[state]; lv_res_t info_res; info_res = lv_img_dsc_get_info(src, &header); diff --git a/lv_objx/lv_imgbtn.h b/lv_objx/lv_imgbtn.h index 64183301e..de9888be1 100644 --- a/lv_objx/lv_imgbtn.h +++ b/lv_objx/lv_imgbtn.h @@ -143,7 +143,7 @@ void lv_imgbtn_set_style(lv_obj_t * imgbtn, lv_imgbtn_style_t type, lv_style_t * * @param state the state where to get the image (from `lv_btn_state_t`) ` * @return pointer to an image source (a C array or path to a file) */ -void * lv_imgbtn_get_src(lv_obj_t * imgbtn, lv_btn_state_t state); +const void * lv_imgbtn_get_src(lv_obj_t * imgbtn, lv_btn_state_t state); /** * Get the current state of the image button