len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Skin Engine: Fix loading images with same file name

Browse source 
Looks like this was a regression introduced in 01cbb79.
The duplicate img uses an existing buflib handle for
the data, but still didn't have access to the dimensions
from the bitmap struct.

Test case: DancePuffDuo theme for Sansa E200. Only one
dancepuff was displayed. Thank you to goatikins for
reporting the issue.

Change-Id: I32c3ebd1f00738f7db52e7a66f98c4ab3489ee4a
This commit is contained in:
Christian Soffke 2023-11-17 15:56:04 +01:00
parent 5114827937
commit 35f9a5b415
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/gui/skin_engine/skin_parser.c
View file

@ -2007,6 +2007,7 @@ static bool load_skin_bitmaps(struct wps_data *wps_data, char *bmpdir)
{ {
struct skin_token_list *imglist = SKINOFFSETTOPTR(skin_buffer, list->next); struct skin_token_list *imglist = SKINOFFSETTOPTR(skin_buffer, list->next);
img->subimage_height = img->bm.height / img->num_subimages; img->subimage_height = img->bm.height / img->num_subimages;
struct bitmap* loaded_bm = &img->bm;
while (imglist) while (imglist)
{ {
token = SKINOFFSETTOPTR(skin_buffer, imglist->token); token = SKINOFFSETTOPTR(skin_buffer, imglist->token);
@ -2016,6 +2017,7 @@ static bool load_skin_bitmaps(struct wps_data *wps_data, char *bmpdir)
{ {
img->loaded = true; img->loaded = true;
img->buflib_handle = handle; img->buflib_handle = handle;
img->bm = *loaded_bm;
img->subimage_height = img->bm.height / img->num_subimages; img->subimage_height = img->bm.height / img->num_subimages;
} }
} }