Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-21 06:53:01 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #756 from amirgon/dev-5.3

Browse Source 
Fix compilation errors
This commit is contained in:
Gabor Kiss-Vamosi 2019-01-25 08:27:14 +01:00 committed by GitHub
commit c8f5638780
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lv_objx/lv_canvas.c
View File

@ -77,7 +77,7 @@ lv_obj_t * lv_canvas_create(lv_obj_t * par, const lv_obj_t * copy)
} }
/*Copy an existing canvas*/ /*Copy an existing canvas*/
else { else {
lv_canvas_ext_t * copy_ext = lv_obj_get_ext_attr(copy); //lv_canvas_ext_t * copy_ext = lv_obj_get_ext_attr(copy);
/*Refresh the style with new signal function*/ /*Refresh the style with new signal function*/
lv_obj_refresh_style(new_canvas); lv_obj_refresh_style(new_canvas);
@ -136,7 +136,7 @@ void lv_canvas_copy_buf(lv_obj_t * canvas, void * to_copy, lv_coord_t w, lv_coor
uint8_t * to_copy8 = (uint8_t *) to_copy; uint8_t * to_copy8 = (uint8_t *) to_copy;
lv_coord_t i; lv_coord_t i;
for(i = 0; i < h; i++) { for(i = 0; i < h; i++) {
memcpy(&ext->dsc.data[px], to_copy8, w * px_size); memcpy((void*)&ext->dsc.data[px], to_copy8, w * px_size);
px += ext->dsc.header.w * px_size; px += ext->dsc.header.w * px_size;
to_copy8 += w * px_size; to_copy8 += w * px_size;
} }
@ -241,7 +241,7 @@ void lv_canvas_set_style(lv_obj_t * canvas, lv_canvas_style_t type, lv_style_t *
*/ */
lv_style_t * lv_canvas_get_style(const lv_obj_t * canvas, lv_canvas_style_t type) lv_style_t * lv_canvas_get_style(const lv_obj_t * canvas, lv_canvas_style_t type)
{ {
lv_canvas_ext_t * ext = lv_obj_get_ext_attr(canvas); // lv_canvas_ext_t * ext = lv_obj_get_ext_attr(canvas);
lv_style_t * style = NULL; lv_style_t * style = NULL;
switch(type) { switch(type) {