Merge pull request #1470 from xennex22/dev-7.0

Fixed compiler warnings and errors
This commit is contained in:
Gabor Kiss-Vamosi
2020-04-24 19:33:43 +02:00
committed by GitHub
3 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -805,7 +805,7 @@ void lv_obj_set_height(lv_obj_t * obj, lv_coord_t h)
* @param obj pointer to an object * @param obj pointer to an object
* @param w the width without paddings * @param w the width without paddings
*/ */
void lv_obj_set_width_fit(const lv_obj_t * obj, lv_coord_t w) void lv_obj_set_width_fit(lv_obj_t * obj, lv_coord_t w)
{ {
lv_style_int_t pleft = lv_obj_get_style_pad_left(obj, LV_OBJ_PART_MAIN); lv_style_int_t pleft = lv_obj_get_style_pad_left(obj, LV_OBJ_PART_MAIN);
lv_style_int_t pright = lv_obj_get_style_pad_right(obj, LV_OBJ_PART_MAIN); lv_style_int_t pright = lv_obj_get_style_pad_right(obj, LV_OBJ_PART_MAIN);
@@ -818,7 +818,7 @@ void lv_obj_set_width_fit(const lv_obj_t * obj, lv_coord_t w)
* @param obj pointer to an object * @param obj pointer to an object
* @param h the height without paddings * @param h the height without paddings
*/ */
void lv_obj_set_height_fit(const lv_obj_t * obj, lv_coord_t h) void lv_obj_set_height_fit(lv_obj_t * obj, lv_coord_t h)
{ {
lv_style_int_t ptop = lv_obj_get_style_pad_top(obj, LV_OBJ_PART_MAIN); lv_style_int_t ptop = lv_obj_get_style_pad_top(obj, LV_OBJ_PART_MAIN);
lv_style_int_t pbottom = lv_obj_get_style_pad_bottom(obj, LV_OBJ_PART_MAIN); lv_style_int_t pbottom = lv_obj_get_style_pad_bottom(obj, LV_OBJ_PART_MAIN);
+2 -2
View File
@@ -431,14 +431,14 @@ void lv_obj_set_height(lv_obj_t * obj, lv_coord_t h);
* @param obj pointer to an object * @param obj pointer to an object
* @param w the width without paddings * @param w the width without paddings
*/ */
void lv_obj_set_width_fit(const lv_obj_t * obj, lv_coord_t w); void lv_obj_set_width_fit(lv_obj_t * obj, lv_coord_t w);
/** /**
* Set the height reduced by the top and bottom padding. * Set the height reduced by the top and bottom padding.
* @param obj pointer to an object * @param obj pointer to an object
* @param h the height without paddings * @param h the height without paddings
*/ */
void lv_obj_set_height_fit(const lv_obj_t * obj, lv_coord_t h); void lv_obj_set_height_fit(lv_obj_t * obj, lv_coord_t h);
/** /**
* Set the width of an object by taking the left and right margin into account. * Set the width of an object by taking the left and right margin into account.
+2 -2
View File
@@ -149,8 +149,8 @@ void * lv_memcpy(void * dst, const void * src, size_t len);
*/ */
static inline void * lv_memcpy_small(void * dst, const void * src, size_t len) static inline void * lv_memcpy_small(void * dst, const void * src, size_t len)
{ {
uint8_t * d8 = dst; uint8_t * d8 = (uint8_t *)dst;
const uint8_t * s8 = src; const uint8_t * s8 = (const uint8_t *)src;
while(len) { while(len) {
*d8 = *s8; d8++; s8++; *d8 = *s8; d8++; s8++;