mirror of
https://github.com/lvgl/lvgl.git
synced 2025-01-28 07:03:00 +08:00
minor conversion fixes to eliminate warnings
This commit is contained in:
parent
fc29f58754
commit
efeec7d3b6
@ -456,11 +456,11 @@ static void ent_trunc(lv_mem_ent_t * e, size_t size)
|
|||||||
uint8_t * e_data = &e->first_data;
|
uint8_t * e_data = &e->first_data;
|
||||||
lv_mem_ent_t * after_new_e = (lv_mem_ent_t *)&e_data[size];
|
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.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 */
|
/* Set the new size for the original entry */
|
||||||
e->header.s.d_size = size;
|
e->header.s.d_size = (uint32_t)size;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -193,7 +193,7 @@ uint8_t lv_gauge_get_label_count(const lv_obj_t * gauge);
|
|||||||
* @param gauge pointer to a gauge object
|
* @param gauge pointer to a gauge object
|
||||||
* @return number of the scale units
|
* @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);
|
return lv_lmeter_get_line_count(gauge);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user