github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

erge branch 'dev-5.3' of github.com:seyyah/lvgl into dev-5.3

Browse Source
This commit is contained in:
seyyah
2019-01-25 14:14:46 +03:00
parent 98b6e446f0 c8f5638780
commit bdb3bb778e
19 changed files with 469 additions and 199 deletions
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*/
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*/
lv_obj_refresh_style(new_canvas);
@@ -158,7 +158,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;
lv_coord_t 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;
to_copy8 += w * px_size;
}
@@ -263,7 +263,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_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;
switch(type) {