fix(image): add data_size filed to all c-array images (#5608)

Signed-off-by: Xu Xingliang <xuxingliang@xiaomi.com>
2026-05-27 11:57:48 +08:00 · 2024-02-07 12:13:00 +08:00
parent d697a3fc95
commit 7579b96b9b
109 changed files with 112 additions and 62 deletions
@@ -133,8 +133,8 @@ const lv_image_dsc_t img_benchmark_cogwheel_alpha256 = {
    .header.cf = LV_COLOR_FORMAT_A8,
    .header.w = 100,
    .header.h = 100,
-    .data_size = 10000,
    .data = img_benchmark_cogwheel_alpha256_map,
+    .data_size = sizeof(img_benchmark_cogwheel_alpha256_map),
 };

 #endif
@@ -427,6 +427,7 @@ const lv_image_dsc_t img_benchmark_cogwheel_argb = {
    //    .data_size = 10000 * LV_COLOR_FORMAT_NATIVE_ALPHA_SIZE,
    .header.cf = LV_COLOR_DEPTH == 16 ? LV_COLOR_FORMAT_RGB565A8 : LV_COLOR_FORMAT_ARGB8888,
    .data = img_benchmark_cogwheel_argb_map,
+    .data_size = sizeof(img_benchmark_cogwheel_argb_map),
 };

 #endif
@@ -134,9 +134,9 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMAGE_IMG_COGWHEEL_INDEXED16 uint8_t i
 const lv_image_dsc_t img_benchmark_cogwheel_indexed16 = {
    .header.w = 100,
    .header.h = 100,
-    .data_size = 5064,
    .header.cf = LV_COLOR_FORMAT_I4,
    .data = img_benchmark_cogwheel_indexed16_map,
+    .data_size = sizeof(img_benchmark_cogwheel_indexed16_map),
 };

 #endif
@@ -325,9 +325,9 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMAGE_IMG_COGWHEEL_RGB uint8_t img_ben
 const lv_image_dsc_t img_benchmark_cogwheel_rgb = {
    .header.w = 100,
    .header.h = 100,
-    .data_size = 10000 * LV_COLOR_DEPTH / 8,
    .header.cf = LV_COLOR_FORMAT_NATIVE,
    .data = img_benchmark_cogwheel_rgb_map,
+    .data_size = sizeof(img_benchmark_cogwheel_rgb_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_1 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_1_map,
+    .data_size = sizeof(img_multilang_avatar_1_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_10 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_10_map,
+    .data_size = sizeof(img_multilang_avatar_10_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_11 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_11_map,
+    .data_size = sizeof(img_multilang_avatar_11_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_12 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_12_map,
+    .data_size = sizeof(img_multilang_avatar_12_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_13 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_13_map,
+    .data_size = sizeof(img_multilang_avatar_13_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_14 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_14_map,
+    .data_size = sizeof(img_multilang_avatar_14_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_15 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_15_map,
+    .data_size = sizeof(img_multilang_avatar_15_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_16 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_16_map,
+    .data_size = sizeof(img_multilang_avatar_16_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_17 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_17_map,
+    .data_size = sizeof(img_multilang_avatar_17_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_18 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_18_map,
+    .data_size = sizeof(img_multilang_avatar_18_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_19 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_19_map,
+    .data_size = sizeof(img_multilang_avatar_19_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_2 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_2_map,
+    .data_size = sizeof(img_multilang_avatar_2_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_22 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_22_map,
+    .data_size = sizeof(img_multilang_avatar_22_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_25 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_25_map,
+    .data_size = sizeof(img_multilang_avatar_25_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_3 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_3_map,
+    .data_size = sizeof(img_multilang_avatar_3_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_4 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_4_map,
+    .data_size = sizeof(img_multilang_avatar_4_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_5 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_5_map,
+    .data_size = sizeof(img_multilang_avatar_5_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_6 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_6_map,
+    .data_size = sizeof(img_multilang_avatar_6_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_7 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_7_map,
+    .data_size = sizeof(img_multilang_avatar_7_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_8 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_8_map,
+    .data_size = sizeof(img_multilang_avatar_8_map),
 };

 #endif
@@ -159,6 +159,7 @@ const lv_image_dsc_t img_multilang_avatar_9 = {
    .header.w = 128,
    .header.h = 128,
    .data = img_multilang_avatar_9_map,
+    .data_size = sizeof(img_multilang_avatar_9_map),
 };

 #endif
@@ -50,6 +50,7 @@ const lv_image_dsc_t img_emoji_artist_palette = {
    .header.w = 18,
    .header.h = 19,
    .data = img_emoji_artist_palette_map,
+    .data_size = sizeof(img_emoji_artist_palette_map),
 };

 #endif
@@ -50,6 +50,7 @@ const lv_image_dsc_t img_emoji_books = {
    .header.w = 18,
    .header.h = 19,
    .data = img_emoji_books_map,
+    .data_size = sizeof(img_emoji_books_map),
 };

 #endif
@@ -50,6 +50,7 @@ const lv_image_dsc_t img_emoji_camera_with_flash = {
    .header.w = 18,
    .header.h = 19,
    .data = img_emoji_camera_with_flash_map,
+    .data_size = sizeof(img_emoji_camera_with_flash_map),
 };

 #endif
@@ -50,6 +50,7 @@ const lv_image_dsc_t img_emoji_cat_face = {
    .header.w = 18,
    .header.h = 19,
    .data = img_emoji_cat_face_map,
+    .data_size = sizeof(img_emoji_cat_face_map),
 };

 #endif
@@ -50,6 +50,7 @@ const lv_image_dsc_t img_emoji_deciduous_tree = {
    .header.w = 16,
    .header.h = 19,
    .data = img_emoji_deciduous_tree_map,
+    .data_size = sizeof(img_emoji_deciduous_tree_map),
 };

 #endif
@@ -50,6 +50,7 @@ const lv_image_dsc_t img_emoji_dog_face = {
    .header.w = 18,
    .header.h = 19,
    .data = img_emoji_dog_face_map,
+    .data_size = sizeof(img_emoji_dog_face_map),
 };

 #endif
@@ -50,6 +50,7 @@ const lv_image_dsc_t img_emoji_earth_globe_europe_africa = {
    .header.w = 19,
    .header.h = 19,
    .data = img_emoji_earth_globe_europe_africa_map,
+    .data_size = sizeof(img_emoji_earth_globe_europe_africa_map),
 };

 #endif
@@ -50,6 +50,7 @@ const lv_image_dsc_t img_emoji_flexed_biceps = {
    .header.w = 18,
    .header.h = 19,
    .data = img_emoji_flexed_biceps_map,
+    .data_size = sizeof(img_emoji_flexed_biceps_map),
 };

 #endif
@@ -50,6 +50,7 @@ const lv_image_dsc_t img_emoji_movie_camera = {
    .header.w = 18,
    .header.h = 19,
    .data = img_emoji_movie_camera_map,
+    .data_size = sizeof(img_emoji_movie_camera_map),
 };

 #endif
@@ -50,6 +50,7 @@ const lv_image_dsc_t img_emoji_red_heart = {
    .header.w = 18,
    .header.h = 19,
    .data = img_emoji_red_heart_map,
+    .data_size = sizeof(img_emoji_red_heart_map),
 };

 #endif
@@ -50,6 +50,7 @@ const lv_image_dsc_t img_emoji_rocket = {
    .header.w = 16,
    .header.h = 19,
    .data = img_emoji_rocket_map,
+    .data_size = sizeof(img_emoji_rocket_map),
 };

 #endif
@@ -50,6 +50,7 @@ const lv_image_dsc_t img_emoji_soccer_ball = {
    .header.w = 18,
    .header.h = 19,
    .data = img_emoji_soccer_ball_map,
+    .data_size = sizeof(img_emoji_soccer_ball_map),
 };

 #endif
@@ -48,6 +48,7 @@ const lv_image_dsc_t img_multilang_like = {
    .header.w = 20,
    .header.h = 17,
    .data = img_multilang_like_map,
+    .data_size = sizeof(img_multilang_like_map),
 };

 #endif
@@ -49,8 +49,8 @@ img_lv_demo_music_btn_corner_map[] = {
 const lv_image_dsc_t img_lv_demo_music_btn_corner = {
    .header.w = 32,
    .header.h = 32,
-    .data_size = 1024 * LV_COLOR_DEPTH / 8,
    .header.cf = LV_COLOR_FORMAT_ARGB8888,
    .data = img_lv_demo_music_btn_corner_map,
+    .data_size = sizeof(img_lv_demo_music_btn_corner_map),
 };
 #endif
@@ -73,6 +73,7 @@ const lv_image_dsc_t img_lv_demo_music_btn_list_pause = {
    .header.h = 60,
    .header.cf = LV_COLOR_FORMAT_ARGB8888,
    .data = img_lv_demo_music_btn_list_pause_map,
+    .data_size = sizeof(img_lv_demo_music_btn_list_pause_map),
 };

 #endif /*LV_USE_DEMO_MUSIC*/
@@ -122,9 +122,9 @@ img_lv_demo_music_btn_list_pause_map[] = {
 const lv_image_dsc_t img_lv_demo_music_btn_list_pause = {
    .header.w = 106,
    .header.h = 105,
-    .data_size = 11130 * LV_COLOR_DEPTH / 8,
    .header.cf = LV_COLOR_FORMAT_ARGB8888,
    .data = img_lv_demo_music_btn_list_pause_map,
+    .data_size = sizeof(img_lv_demo_music_btn_list_pause_map),
 };
 #endif

@@ -71,9 +71,9 @@ const LV_ATTRIBUTE_MEM_ALIGN uint8_t img_lv_demo_music_btn_list_play_map[] = {
 const lv_image_dsc_t img_lv_demo_music_btn_list_play = {
    .header.w = 58,
    .header.h = 60,
-    .data_size = 3480 * LV_COLOR_DEPTH / 8,
    .header.cf = LV_COLOR_FORMAT_ARGB8888,
    .data = img_lv_demo_music_btn_list_play_map,
+    .data_size = sizeof(img_lv_demo_music_btn_list_play_map),
 };


@@ -122,9 +122,9 @@ img_lv_demo_music_btn_list_play_map[] = {
 const lv_image_dsc_t img_lv_demo_music_btn_list_play = {
    .header.w = 106,
    .header.h = 105,
-    .data_size = 11130 * LV_COLOR_DEPTH / 8,
    .header.cf = LV_COLOR_FORMAT_ARGB8888,
    .data = img_lv_demo_music_btn_list_play_map,
+    .data_size = sizeof(img_lv_demo_music_btn_list_play_map),
 };

 #endif
@@ -35,9 +35,9 @@ const LV_ATTRIBUTE_MEM_ALIGN uint8_t img_lv_demo_music_btn_loop_map[] = {
 const lv_image_dsc_t img_lv_demo_music_btn_loop = {
    .header.w = 24,
    .header.h = 24,
-    .data_size = 576 * LV_COLOR_DEPTH / 8,
    .header.cf = LV_COLOR_FORMAT_ARGB8888,
    .data = img_lv_demo_music_btn_loop_map,
+    .data_size = sizeof(img_lv_demo_music_btn_loop_map),
 };

 #endif /*LV_USE_DEMO_MUSIC*/
@@ -53,9 +53,9 @@ img_lv_demo_music_btn_loop_map[] = {
 const lv_image_dsc_t img_lv_demo_music_btn_loop = {
    .header.w = 37,
    .header.h = 36,
-    .data_size = 1332 * LV_COLOR_DEPTH / 8,
    .header.cf = LV_COLOR_FORMAT_ARGB8888,
    .data = img_lv_demo_music_btn_loop_map,
+    .data_size = sizeof(img_lv_demo_music_btn_loop_map),
 };

 #endif
@@ -73,9 +73,9 @@ const LV_ATTRIBUTE_MEM_ALIGN uint8_t img_lv_demo_music_btn_next_map[] = {
 const lv_image_dsc_t img_lv_demo_music_btn_next = {
    .header.w = 62,
    .header.h = 62,
-    .data_size = 3844 * LV_COLOR_DEPTH / 8,
    .header.cf = LV_COLOR_FORMAT_ARGB8888,
    .data = img_lv_demo_music_btn_next_map,
+    .data_size = sizeof(img_lv_demo_music_btn_next_map),
 };

 #endif /*LV_USE_DEMO_MUSIC*/
@@ -127,9 +127,9 @@ img_lv_demo_music_btn_next_map[] = {
 const lv_image_dsc_t img_lv_demo_music_btn_next = {
    .header.w = 110,
    .header.h = 110,
-    .data_size = 12100 * LV_COLOR_DEPTH / 8,
    .header.cf = LV_COLOR_FORMAT_ARGB8888,
    .data = img_lv_demo_music_btn_next_map,
+    .data_size = sizeof(img_lv_demo_music_btn_next_map),
 };

 #endif
@@ -88,9 +88,9 @@ const LV_ATTRIBUTE_MEM_ALIGN uint8_t img_lv_demo_music_btn_pause_map[] = {
 const lv_image_dsc_t img_lv_demo_music_btn_pause = {
    .header.w = 79,
    .header.h = 77,
-    .data_size = 6083 * LV_COLOR_DEPTH / 8,
    .header.cf = LV_COLOR_FORMAT_ARGB8888,
    .data = img_lv_demo_music_btn_pause_map,
+    .data_size = sizeof(img_lv_demo_music_btn_pause_map),
 };

 #endif /*LV_USE_DEMO_MUSIC*/
@@ -160,9 +160,9 @@ img_lv_demo_music_btn_pause_map[] = {
 const lv_image_dsc_t img_lv_demo_music_btn_pause = {
    .header.w = 141,
    .header.h = 142,
-    .data_size = 20022 * LV_COLOR_DEPTH / 8,
    .header.cf = LV_COLOR_FORMAT_ARGB8888,
    .data = img_lv_demo_music_btn_pause_map,
+    .data_size = sizeof(img_lv_demo_music_btn_pause_map),
 };

 #endif
@@ -88,9 +88,9 @@ const LV_ATTRIBUTE_MEM_ALIGN uint8_t img_lv_demo_music_btn_play_map[] = {
 const lv_image_dsc_t img_lv_demo_music_btn_play = {
    .header.w = 79,
    .header.h = 77,
-    .data_size = 6083 * LV_COLOR_DEPTH / 8,
    .header.cf = LV_COLOR_FORMAT_ARGB8888,
    .data = img_lv_demo_music_btn_play_map,
+    .data_size = sizeof(img_lv_demo_music_btn_play_map),
 };

 #endif /*LV_USE_DEMO_MUSIC*/
--- a/Show More
+++ b/Show More