From 29f04f5443ceb0b658a354db5d54049156ca50cf Mon Sep 17 00:00:00 2001 From: Neo Xu Date: Tue, 19 Dec 2023 18:55:31 +0800 Subject: [PATCH] chore: rename _unaligned to avoid MSVC compile issue (#5028) Signed-off-by: Xu Xingliang --- src/draw/lv_draw_buf.c | 4 ++-- src/draw/lv_draw_buf.h | 4 ++-- src/widgets/canvas/lv_canvas.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/draw/lv_draw_buf.c b/src/draw/lv_draw_buf.c index f5801ccc3..ccf75a9a2 100644 --- a/src/draw/lv_draw_buf.c +++ b/src/draw/lv_draw_buf.c @@ -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.stride = stride; draw_buf->data = lv_draw_buf_align(buf, cf); - draw_buf->_unaligned = buf; + draw_buf->unaligned_data = buf; draw_buf->data_size = size; return draw_buf; } @@ -149,7 +149,7 @@ void lv_draw_buf_destroy(lv_draw_buf_t * buf) LV_ASSERT_NULL(buf); if(buf == NULL) return; if(buf->header.flags & LV_IMAGE_FLAGS_MODIFIABLE) - lv_draw_buf_free(buf->_unaligned); + lv_draw_buf_free(buf->unaligned_data); lv_free(buf); } diff --git a/src/draw/lv_draw_buf.h b/src/draw/lv_draw_buf.h index 8448feb35..973541c1f 100644 --- a/src/draw/lv_draw_buf.h +++ b/src/draw/lv_draw_buf.h @@ -29,7 +29,7 @@ typedef struct { lv_image_header_t header; uint32_t data_size; /*Total buf size in bytes*/ void * data; - void * _unaligned; /*Unaligned address of data*/ + void * unaligned_data; /*Unaligned address of `data`, used internally by lvgl*/ } lv_draw_buf_t; /** @@ -60,7 +60,7 @@ typedef struct { }, \ .data_size = sizeof(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); diff --git a/src/widgets/canvas/lv_canvas.c b/src/widgets/canvas/lv_canvas.c index a436c35cd..d16958f32 100644 --- a/src/widgets/canvas/lv_canvas.c +++ b/src/widgets/canvas/lv_canvas.c @@ -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); canvas->static_buf.data_size = stride * h; 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; 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; if(canvas->draw_buf) - return canvas->draw_buf->_unaligned; + return canvas->draw_buf->unaligned_data; return NULL; }