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

chore: rename _unaligned to avoid MSVC compile issue (#5028)

Browse Source 
Signed-off-by: Xu Xingliang <xuxingliang@xiaomi.com>
This commit is contained in:
Neo Xu
2023-12-19 18:55:31 +08:00
committed by GitHub
parent 76d7b3dd70
commit 29f04f5443
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/draw/lv_draw_buf.c
View File

@@ -139,7 +139,7 @@ lv_draw_buf_t * lv_draw_buf_create(uint32_t w, uint32_t h, lv_color_format_t cf,
draw_buf->header.flags = LV_IMAGE_FLAGS_MODIFIABLE; draw_buf->header.flags = LV_IMAGE_FLAGS_MODIFIABLE;
draw_buf->header.stride = stride; draw_buf->header.stride = stride;
draw_buf->data = lv_draw_buf_align(buf, cf); draw_buf->data = lv_draw_buf_align(buf, cf);
draw_buf->_unaligned = buf; draw_buf->unaligned_data = buf;
draw_buf->data_size = size; draw_buf->data_size = size;
return draw_buf; return draw_buf;
} }
@@ -149,7 +149,7 @@ void lv_draw_buf_destroy(lv_draw_buf_t * buf)
LV_ASSERT_NULL(buf); LV_ASSERT_NULL(buf);
if(buf == NULL) return; if(buf == NULL) return;
if(buf->header.flags & LV_IMAGE_FLAGS_MODIFIABLE) if(buf->header.flags & LV_IMAGE_FLAGS_MODIFIABLE)
lv_draw_buf_free(buf->_unaligned); lv_draw_buf_free(buf->unaligned_data);
lv_free(buf); lv_free(buf);
} }

4
src/draw/lv_draw_buf.h
View File

@@ -29,7 +29,7 @@ typedef struct {
lv_image_header_t header; lv_image_header_t header;
uint32_t data_size; /*Total buf size in bytes*/ uint32_t data_size; /*Total buf size in bytes*/
void * data; void * data;
void * _unaligned; /*Unaligned address of data*/ void * unaligned_data; /*Unaligned address of `data`, used internally by lvgl*/
} lv_draw_buf_t; } lv_draw_buf_t;
/** /**
@@ -60,7 +60,7 @@ typedef struct {
}, \ }, \
.data_size = sizeof(buf_##name), \ .data_size = sizeof(buf_##name), \
.data = buf_##name, \ .data = buf_##name, \
._unaligned = buf_##name, \ .unaligned_data = buf_##name, \
} }
typedef void * (*lv_draw_buf_malloc_cb)(size_t size, lv_color_format_t color_format); typedef void * (*lv_draw_buf_malloc_cb)(size_t size, lv_color_format_t color_format);

4
src/widgets/canvas/lv_canvas.c
View File

@@ -74,7 +74,7 @@ void lv_canvas_set_buffer(lv_obj_t * obj, void * buf, int32_t w, int32_t h, lv_c
lv_image_header_init(&canvas->static_buf.header, w, h, cf, stride, 0); lv_image_header_init(&canvas->static_buf.header, w, h, cf, stride, 0);
canvas->static_buf.data_size = stride * h; canvas->static_buf.data_size = stride * h;
canvas->static_buf.data = lv_draw_buf_align(buf, cf); canvas->static_buf.data = lv_draw_buf_align(buf, cf);
canvas->static_buf._unaligned = buf; canvas->static_buf.unaligned_data = buf;
canvas->draw_buf = &canvas->static_buf; canvas->draw_buf = &canvas->static_buf;
const void * src = lv_image_get_src(obj); const void * src = lv_image_get_src(obj);
@@ -243,7 +243,7 @@ const void * lv_canvas_get_buf(lv_obj_t * obj)
lv_canvas_t * canvas = (lv_canvas_t *)obj; lv_canvas_t * canvas = (lv_canvas_t *)obj;
if(canvas->draw_buf) if(canvas->draw_buf)
return canvas->draw_buf->_unaligned; return canvas->draw_buf->unaligned_data;
return NULL; return NULL;
} }