1
0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00

fix issue:LVGL V9 music compiling error (#4703)

Signed-off-by: lijianjun <lijianjun@xiaomi.com>
Co-authored-by: lijianjun <lijianjun@xiaomi.com>
This commit is contained in:
lion2tomato 2023-10-25 02:45:43 +08:00 committed by GitHub
parent d98e7b27cb
commit f273475d28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 39 additions and 39 deletions

View File

@ -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

View File

@ -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

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};

View File

@ -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,
};