fixed SDL 2.30.0 bitmap rendering on webOS

mariotaku · Feb 26, 2024 · fd8f7f2 · fd8f7f2
1 parent 7ebc9ee
commit fd8f7f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/app/ui/launcher/coverloader.c b/src/app/ui/launcher/coverloader.c
@@ -302,8 +302,9 @@ static bool coverloader_filecache_get(coverloader_req_t *req) {
         SDL_FreeSurface(decoded);
         return false;
     }
-    if (decoded->format->palette != NULL) {
-        SDL_Surface *true_color = SDL_ConvertSurfaceFormat(decoded, SDL_PIXELFORMAT_RGB24, 0);
+    // With SDL 2.30.0 and above, 24 bit images are broken on webOS
+    if (decoded->format->palette != NULL || decoded->format->BitsPerPixel < 32) {
+        SDL_Surface *true_color = SDL_ConvertSurfaceFormat(decoded, SDL_PIXELFORMAT_ABGR32, 0);
         SDL_FreeSurface(decoded);
         if (true_color == NULL) {
             return false;

diff --git a/third_party/lvgl b/third_party/lvgl
+18 −0		Kconfig
+45 −0		docs/CHANGELOG.md
+30 −6		docs/libs/fsdrv.md
+1 −0		docs/libs/index.md
+35 −0		docs/libs/tiny_ttf.md
+1 −1		docs/overview/object.md
+8 −8		docs/overview/style-props.md
+3 −1		docs/widgets/core/label.md
+6 −0		env_support/cmake/custom.cmake
+ −		env_support/cmsis-pack/LVGL.lvgl.8.3.11.pack
+36 −12		env_support/cmsis-pack/LVGL.lvgl.pdsc
+2 −2		env_support/cmsis-pack/LVGL.pidx
+47 −10		env_support/cmsis-pack/README.md
+103 −38		env_support/cmsis-pack/lv_conf_cmsis.h
+1 −1		env_support/rt-thread/lv_rt_thread_port.c
+1 −1		library.json
+1 −1		library.properties
+15 −1		lv_conf_template.h
+1 −1		lvgl.h
+2 −2		scripts/style_api_gen.py
+6 −2		src/core/lv_disp.c
+6 −2		src/core/lv_obj.c
+1 −0		src/core/lv_obj.h
+4 −5		src/core/lv_obj_draw.c
+16 −12		src/core/lv_obj_pos.c
+1 −1		src/core/lv_obj_scroll.h
+2 −4		src/core/lv_obj_style_gen.c
+9 −18		src/core/lv_obj_style_gen.h
+0 −6		src/core/lv_obj_tree.c
+1 −1		src/draw/sdl/lv_draw_sdl_img.c
+47 −28		src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.c
+1 −1		src/draw/sw/lv_draw_sw_letter.c
+1 −1		src/draw/sw/lv_draw_sw_transform.c
+332 −0		src/extra/libs/fsdrv/lv_fs_littlefs.c
+5 −0		src/extra/libs/fsdrv/lv_fsdrv.h
+1 −0		src/extra/libs/lv_libs.h
+79 −79		src/extra/libs/qrcode/qrcodegen.c
+284 −0		src/extra/libs/tiny_ttf/lv_tiny_ttf.c
+62 −0		src/extra/libs/tiny_ttf/lv_tiny_ttf.h
+637 −0		src/extra/libs/tiny_ttf/stb_rect_pack.h
+5,572 −0		src/extra/libs/tiny_ttf/stb_truetype_htcw.h
+4 −0		src/extra/lv_extra.c
+3 −0		src/extra/others/ime/lv_ime_pinyin.c
+1 −1		src/extra/widgets/keyboard/lv_keyboard.c
+9 −5		src/extra/widgets/meter/lv_meter.c
+0 −1		src/extra/widgets/meter/lv_meter.h
+44 −0		src/lv_conf_internal.h
+0 −1		src/misc/lv_fs.h
+6 −0		src/misc/lv_printf.h
+156 −7		src/widgets/lv_arc.c
+5 −4		src/widgets/lv_arc.h
+3 −0		src/widgets/lv_btnmatrix.c
+8 −6		src/widgets/lv_checkbox.c
+1 −1		src/widgets/lv_checkbox.h
+6 −1		src/widgets/lv_dropdown.c
+132 −41		src/widgets/lv_table.c
+31 −1		src/widgets/lv_table.h
+2 −1		tests/CMakeLists.txt
+ −		tests/ref_imgs/arc_1.png
+ −		tests/ref_imgs/arc_2.png
+ −		tests/ref_imgs/tiny_ttf_1.png
+2 −0		tests/src/lv_test_conf.h
+47 −0		tests/src/test_cases/test_arc.c
+49 −0		tests/src/test_cases/test_tiny_ttf.c
+11,970 −0		tests/src/test_fonts/ubuntu_font.c