From f273475d285608b20aa9d70e4988af667e8b0f63 Mon Sep 17 00:00:00 2001 From: lion2tomato <103997543+lion2tomato@users.noreply.github.com> Date: Wed, 25 Oct 2023 02:45:43 +0800 Subject: [PATCH] fix issue:LVGL V9 music compiling error (#4703) Signed-off-by: lijianjun Co-authored-by: lijianjun --- demos/music/assets/img_lv_demo_music_btn_corner_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_btn_list_pause_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_btn_list_play_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_btn_loop_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_btn_next_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_btn_pause_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_btn_play_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_btn_prev_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_btn_rnd_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_corner_left_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_corner_right_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_cover_1_large.c | 2 +- demos/music/assets/img_lv_demo_music_cover_2_large.c | 2 +- demos/music/assets/img_lv_demo_music_cover_3_large.c | 2 +- demos/music/assets/img_lv_demo_music_icon_1_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_icon_2_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_icon_3_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_icon_4_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_list_border_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_slider_knob_large.c | 4 ++-- demos/music/assets/img_lv_demo_music_wave_bottom_large.c | 2 +- demos/music/assets/img_lv_demo_music_wave_top_large.c | 2 +- 22 files changed, 39 insertions(+), 39 deletions(-) diff --git a/demos/music/assets/img_lv_demo_music_btn_corner_large.c b/demos/music/assets/img_lv_demo_music_btn_corner_large.c index b0241c1c4..11a7d69fe 100644 --- a/demos/music/assets/img_lv_demo_music_btn_corner_large.c +++ b/demos/music/assets/img_lv_demo_music_btn_corner_large.c @@ -122,8 +122,8 @@ const lv_image_dsc_t img_lv_demo_music_btn_corner = { .header.always_zero = 0, .header.w = 32, .header.h = 32, - .data_size = 1024 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 1024 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_btn_corner_map, }; #endif diff --git a/demos/music/assets/img_lv_demo_music_btn_list_pause_large.c b/demos/music/assets/img_lv_demo_music_btn_list_pause_large.c index abc8aff5f..4e70a4cc7 100644 --- a/demos/music/assets/img_lv_demo_music_btn_list_pause_large.c +++ b/demos/music/assets/img_lv_demo_music_btn_list_pause_large.c @@ -341,8 +341,8 @@ const lv_image_dsc_t img_lv_demo_music_btn_list_pause = { .header.always_zero = 0, .header.w = 106, .header.h = 105, - .data_size = 11130 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 11130 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_btn_list_pause_map, }; #endif diff --git a/demos/music/assets/img_lv_demo_music_btn_list_play_large.c b/demos/music/assets/img_lv_demo_music_btn_list_play_large.c index dd4bae08a..118db1de7 100644 --- a/demos/music/assets/img_lv_demo_music_btn_list_play_large.c +++ b/demos/music/assets/img_lv_demo_music_btn_list_play_large.c @@ -341,8 +341,8 @@ const lv_image_dsc_t img_lv_demo_music_btn_list_play = { .header.always_zero = 0, .header.w = 106, .header.h = 105, - .data_size = 11130 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 11130 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_btn_list_play_map, }; diff --git a/demos/music/assets/img_lv_demo_music_btn_loop_large.c b/demos/music/assets/img_lv_demo_music_btn_loop_large.c index deb063933..1e24bd73a 100644 --- a/demos/music/assets/img_lv_demo_music_btn_loop_large.c +++ b/demos/music/assets/img_lv_demo_music_btn_loop_large.c @@ -134,8 +134,8 @@ const lv_image_dsc_t img_lv_demo_music_btn_loop = { .header.always_zero = 0, .header.w = 37, .header.h = 36, - .data_size = 1332 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 1332 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_btn_loop_map, }; diff --git a/demos/music/assets/img_lv_demo_music_btn_next_large.c b/demos/music/assets/img_lv_demo_music_btn_next_large.c index 13eec1e14..4ba50d746 100644 --- a/demos/music/assets/img_lv_demo_music_btn_next_large.c +++ b/demos/music/assets/img_lv_demo_music_btn_next_large.c @@ -356,8 +356,8 @@ const lv_image_dsc_t img_lv_demo_music_btn_next = { .header.always_zero = 0, .header.w = 110, .header.h = 110, - .data_size = 12100 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 12100 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_btn_next_map, }; diff --git a/demos/music/assets/img_lv_demo_music_btn_pause_large.c b/demos/music/assets/img_lv_demo_music_btn_pause_large.c index 2e29b72ee..bdb329dbd 100644 --- a/demos/music/assets/img_lv_demo_music_btn_pause_large.c +++ b/demos/music/assets/img_lv_demo_music_btn_pause_large.c @@ -453,8 +453,8 @@ const lv_image_dsc_t img_lv_demo_music_btn_pause = { .header.always_zero = 0, .header.w = 141, .header.h = 142, - .data_size = 20022 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 20022 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_btn_pause_map, }; diff --git a/demos/music/assets/img_lv_demo_music_btn_play_large.c b/demos/music/assets/img_lv_demo_music_btn_play_large.c index 1d38e702b..46f4860da 100644 --- a/demos/music/assets/img_lv_demo_music_btn_play_large.c +++ b/demos/music/assets/img_lv_demo_music_btn_play_large.c @@ -453,8 +453,8 @@ const lv_image_dsc_t img_lv_demo_music_btn_play = { .header.always_zero = 0, .header.w = 141, .header.h = 142, - .data_size = 20022 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 20022 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_btn_play_map, }; diff --git a/demos/music/assets/img_lv_demo_music_btn_prev_large.c b/demos/music/assets/img_lv_demo_music_btn_prev_large.c index addffd54f..ca9bb3330 100644 --- a/demos/music/assets/img_lv_demo_music_btn_prev_large.c +++ b/demos/music/assets/img_lv_demo_music_btn_prev_large.c @@ -357,8 +357,8 @@ const lv_image_dsc_t img_lv_demo_music_btn_prev = { .header.always_zero = 0, .header.w = 110, .header.h = 110, - .data_size = 12100 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 12100 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_btn_prev_map, }; diff --git a/demos/music/assets/img_lv_demo_music_btn_rnd_large.c b/demos/music/assets/img_lv_demo_music_btn_rnd_large.c index 7c3f0a159..5f4ba4473 100644 --- a/demos/music/assets/img_lv_demo_music_btn_rnd_large.c +++ b/demos/music/assets/img_lv_demo_music_btn_rnd_large.c @@ -134,8 +134,8 @@ const lv_image_dsc_t img_lv_demo_music_btn_rnd = { .header.always_zero = 0, .header.w = 37, .header.h = 36, - .data_size = 1332 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 1332 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_btn_rnd_map, }; diff --git a/demos/music/assets/img_lv_demo_music_corner_left_large.c b/demos/music/assets/img_lv_demo_music_corner_left_large.c index 336ed3ae3..69c6c454c 100644 --- a/demos/music/assets/img_lv_demo_music_corner_left_large.c +++ b/demos/music/assets/img_lv_demo_music_corner_left_large.c @@ -124,8 +124,8 @@ const lv_image_dsc_t img_lv_demo_music_corner_left = { .header.always_zero = 0, .header.w = 32, .header.h = 32, - .data_size = 1024 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 1024 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_corner_left_map, }; diff --git a/demos/music/assets/img_lv_demo_music_corner_right_large.c b/demos/music/assets/img_lv_demo_music_corner_right_large.c index 20b01f4d2..9a74b9093 100644 --- a/demos/music/assets/img_lv_demo_music_corner_right_large.c +++ b/demos/music/assets/img_lv_demo_music_corner_right_large.c @@ -124,8 +124,8 @@ const lv_image_dsc_t img_lv_demo_music_corner_right = { .header.always_zero = 0, .header.w = 32, .header.h = 32, - .data_size = 1024 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 1024 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_corner_right_map, }; diff --git a/demos/music/assets/img_lv_demo_music_cover_1_large.c b/demos/music/assets/img_lv_demo_music_cover_1_large.c index 5660247c1..0e3db495b 100644 --- a/demos/music/assets/img_lv_demo_music_cover_1_large.c +++ b/demos/music/assets/img_lv_demo_music_cover_1_large.c @@ -1311,7 +1311,7 @@ const lv_image_dsc_t img_lv_demo_music_cover_1 = { .header.always_zero = 0, .header.w = 428, .header.h = 428, - .data_size = 183184 * LV_COLOR_SIZE / 8, + .data_size = 183184 * LV_COLOR_DEPTH / 8, .header.cf = LV_COLOR_FORMAT_NATIVE, .data = img_lv_demo_music_cover_1_map, }; diff --git a/demos/music/assets/img_lv_demo_music_cover_2_large.c b/demos/music/assets/img_lv_demo_music_cover_2_large.c index 3ddb45de3..5d564f02e 100644 --- a/demos/music/assets/img_lv_demo_music_cover_2_large.c +++ b/demos/music/assets/img_lv_demo_music_cover_2_large.c @@ -1311,7 +1311,7 @@ const lv_image_dsc_t img_lv_demo_music_cover_2 = { .header.always_zero = 0, .header.w = 428, .header.h = 428, - .data_size = 183184 * LV_COLOR_SIZE / 8, + .data_size = 183184 * LV_COLOR_DEPTH / 8, .header.cf = LV_COLOR_FORMAT_NATIVE, .data = img_lv_demo_music_cover_2_map, }; diff --git a/demos/music/assets/img_lv_demo_music_cover_3_large.c b/demos/music/assets/img_lv_demo_music_cover_3_large.c index a164506c9..2d531814d 100644 --- a/demos/music/assets/img_lv_demo_music_cover_3_large.c +++ b/demos/music/assets/img_lv_demo_music_cover_3_large.c @@ -1311,7 +1311,7 @@ const lv_image_dsc_t img_lv_demo_music_cover_3 = { .header.always_zero = 0, .header.w = 428, .header.h = 428, - .data_size = 183184 * LV_COLOR_SIZE / 8, + .data_size = 183184 * LV_COLOR_DEPTH / 8, .header.cf = LV_COLOR_FORMAT_NATIVE, .data = img_lv_demo_music_cover_3_map, }; diff --git a/demos/music/assets/img_lv_demo_music_icon_1_large.c b/demos/music/assets/img_lv_demo_music_icon_1_large.c index f80326dde..11eeadb0d 100644 --- a/demos/music/assets/img_lv_demo_music_icon_1_large.c +++ b/demos/music/assets/img_lv_demo_music_icon_1_large.c @@ -118,8 +118,8 @@ const lv_image_dsc_t img_lv_demo_music_icon_1 = { .header.always_zero = 0, .header.w = 30, .header.h = 30, - .data_size = 900 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 900 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_icon_1_map, }; diff --git a/demos/music/assets/img_lv_demo_music_icon_2_large.c b/demos/music/assets/img_lv_demo_music_icon_2_large.c index aff1401cf..ba099462f 100644 --- a/demos/music/assets/img_lv_demo_music_icon_2_large.c +++ b/demos/music/assets/img_lv_demo_music_icon_2_large.c @@ -121,8 +121,8 @@ const lv_image_dsc_t img_lv_demo_music_icon_2 = { .header.always_zero = 0, .header.w = 31, .header.h = 31, - .data_size = 961 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 961 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_icon_2_map, }; diff --git a/demos/music/assets/img_lv_demo_music_icon_3_large.c b/demos/music/assets/img_lv_demo_music_icon_3_large.c index 27297e295..85459f7ef 100644 --- a/demos/music/assets/img_lv_demo_music_icon_3_large.c +++ b/demos/music/assets/img_lv_demo_music_icon_3_large.c @@ -124,8 +124,8 @@ const lv_image_dsc_t img_lv_demo_music_icon_3 = { .header.always_zero = 0, .header.w = 34, .header.h = 32, - .data_size = 1088 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 1088 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_icon_3_map, }; diff --git a/demos/music/assets/img_lv_demo_music_icon_4_large.c b/demos/music/assets/img_lv_demo_music_icon_4_large.c index a795f7de9..326a80256 100644 --- a/demos/music/assets/img_lv_demo_music_icon_4_large.c +++ b/demos/music/assets/img_lv_demo_music_icon_4_large.c @@ -118,8 +118,8 @@ const lv_image_dsc_t img_lv_demo_music_icon_4 = { .header.always_zero = 0, .header.w = 32, .header.h = 30, - .data_size = 960 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 960 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_icon_4_map, }; diff --git a/demos/music/assets/img_lv_demo_music_list_border_large.c b/demos/music/assets/img_lv_demo_music_list_border_large.c index b659aff60..879d65500 100644 --- a/demos/music/assets/img_lv_demo_music_list_border_large.c +++ b/demos/music/assets/img_lv_demo_music_list_border_large.c @@ -49,8 +49,8 @@ const lv_image_dsc_t img_lv_demo_music_list_border = { .header.always_zero = 0, .header.w = 479, .header.h = 7, - .data_size = 3353 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 3353 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_list_border_map, }; diff --git a/demos/music/assets/img_lv_demo_music_slider_knob_large.c b/demos/music/assets/img_lv_demo_music_slider_knob_large.c index 27fcd20c0..d64f2bfee 100644 --- a/demos/music/assets/img_lv_demo_music_slider_knob_large.c +++ b/demos/music/assets/img_lv_demo_music_slider_knob_large.c @@ -225,8 +225,8 @@ const lv_image_dsc_t img_lv_demo_music_slider_knob = { .header.always_zero = 0, .header.w = 66, .header.h = 66, - .data_size = 4356 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, - .header.cf = LV_COLOR_FORMAT_NATIVE_ALPHA, + // .data_size = 4356 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE, + .header.cf = LV_COLOR_FORMAT_NATIVE_WITH_ALPHA, .data = img_lv_demo_music_slider_knob_map, }; diff --git a/demos/music/assets/img_lv_demo_music_wave_bottom_large.c b/demos/music/assets/img_lv_demo_music_wave_bottom_large.c index bb0a29e51..b4d8d6e09 100644 --- a/demos/music/assets/img_lv_demo_music_wave_bottom_large.c +++ b/demos/music/assets/img_lv_demo_music_wave_bottom_large.c @@ -249,7 +249,7 @@ const lv_image_dsc_t img_lv_demo_music_wave_bottom = { .header.always_zero = 0, .header.w = 479, .header.h = 74, - .data_size = 35446 * LV_COLOR_SIZE / 8, + .data_size = 35446 * LV_COLOR_DEPTH / 8, .header.cf = LV_COLOR_FORMAT_NATIVE, .data = img_lv_demo_music_wave_bottom_map, }; diff --git a/demos/music/assets/img_lv_demo_music_wave_top_large.c b/demos/music/assets/img_lv_demo_music_wave_top_large.c index 9939b9652..4462c7a06 100644 --- a/demos/music/assets/img_lv_demo_music_wave_top_large.c +++ b/demos/music/assets/img_lv_demo_music_wave_top_large.c @@ -249,7 +249,7 @@ const lv_image_dsc_t img_lv_demo_music_wave_top = { .header.always_zero = 0, .header.w = 479, .header.h = 74, - .data_size = 35446 * LV_COLOR_SIZE / 8, + .data_size = 35446 * LV_COLOR_DEPTH / 8, .header.cf = LV_COLOR_FORMAT_NATIVE, .data = img_lv_demo_music_wave_top_map, };