From ea7c82f47827a297b5d4a235454c67139154c46f Mon Sep 17 00:00:00 2001 From: Themba Dube Date: Tue, 9 Apr 2019 16:18:04 -0400 Subject: [PATCH] Fix warnings reported in #1008 --- src/lv_core/lv_obj.c | 2 -- src/lv_draw/lv_draw_line.c | 4 ++-- src/lv_objx/lv_roller.c | 7 +++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/lv_core/lv_obj.c b/src/lv_core/lv_obj.c index 06353ac72..fc7e94f46 100644 --- a/src/lv_core/lv_obj.c +++ b/src/lv_core/lv_obj.c @@ -99,10 +99,8 @@ void lv_init(void) lv_ll_init(&LV_GC_ROOT(_lv_disp_ll), sizeof(lv_disp_t)); lv_ll_init(&LV_GC_ROOT(_lv_indev_ll), sizeof(lv_indev_t)); -#if LV_INDEV_READ_PERIOD != 0 /*Init the input device handling*/ lv_indev_init(); -#endif lv_initialized = true; LV_LOG_INFO("lv_init ready"); diff --git a/src/lv_draw/lv_draw_line.c b/src/lv_draw/lv_draw_line.c index 470b5cea0..dc2da5d51 100644 --- a/src/lv_draw/lv_draw_line.c +++ b/src/lv_draw/lv_draw_line.c @@ -436,8 +436,8 @@ static void line_draw_skew(line_draw_t * main_line, bool dir_ori, const lv_area_ #if LV_ANTIALIAS /*Shift the anti aliasing on the edges (-1, 1 or 0 (zero only in case width == 0))*/ - lv_coord_t aa_shift1; - lv_coord_t aa_shift2; + lv_coord_t aa_shift1 = 0; + lv_coord_t aa_shift2 = 0; if(aa) { if(main_line->hor == false) { if(main_line->sx < 0) { diff --git a/src/lv_objx/lv_roller.c b/src/lv_objx/lv_roller.c index dcfc5c070..ebd43cab2 100644 --- a/src/lv_objx/lv_roller.c +++ b/src/lv_objx/lv_roller.c @@ -651,10 +651,11 @@ static void refr_position(lv_obj_t * roller, bool anim_en) /** * Set the middle page for the roller if inifinte is enabled - * @param roller_scrl pointer to the roller's scrollable + * @param scrl pointer to the roller's scrollable (lv_obj_t *) */ -static void inf_normalize(void * roller_scrl) +static void inf_normalize(void * scrl) { + lv_obj_t * roller_scrl= (lv_obj_t *)scrl; lv_obj_t * roller = lv_obj_get_parent(roller_scrl); lv_roller_ext_t * ext = lv_obj_get_ext_attr(roller); @@ -667,8 +668,6 @@ static void inf_normalize(void * roller_scrl) (LV_ROLLER_INF_PAGES / 2) * real_id_cnt; /*Select the middle page*/ /*Move to the new id*/ - lv_obj_t * roller_scrl = lv_page_get_scrl(roller); - lv_roller_ext_t * ext = lv_obj_get_ext_attr(roller); lv_style_t * style_label = lv_obj_get_style(ext->ddlist.label); const lv_font_t * font = style_label->text.font; lv_coord_t font_h = lv_font_get_height(font);