Skip to content

Commit

Permalink
minor conversion fixes to eliminate warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
kisvegabor committed Dec 9, 2019
1 parent fc29f58 commit efeec7d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/lv_misc/lv_mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -456,11 +456,11 @@ static void ent_trunc(lv_mem_ent_t * e, size_t size)
uint8_t * e_data = &e->first_data;
lv_mem_ent_t * after_new_e = (lv_mem_ent_t *)&e_data[size];
after_new_e->header.s.used = 0;
after_new_e->header.s.d_size = e->header.s.d_size - size - sizeof(lv_mem_header_t);
after_new_e->header.s.d_size = (uint32_t)e->header.s.d_size - size - sizeof(lv_mem_header_t);
}

/* Set the new size for the original entry */
e->header.s.d_size = size;
e->header.s.d_size = (uint32_t)size;
}

#endif
2 changes: 1 addition & 1 deletion src/lv_objx/lv_gauge.h
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ uint8_t lv_gauge_get_label_count(const lv_obj_t * gauge);
* @param gauge pointer to a gauge object
* @return number of the scale units
*/
static inline uint8_t lv_gauge_get_line_count(const lv_obj_t * gauge)
static inline uint16_t lv_gauge_get_line_count(const lv_obj_t * gauge)
{
return lv_lmeter_get_line_count(gauge);
}
Expand Down

0 comments on commit efeec7d

Please sign in to comment.