devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

don't load the same bmp image more than once in a skin

Browse source 
Change-Id: Ie38146a80bb356f40810f017c262b81edac69688
This commit is contained in:
Jonathan Gordon 2014-03-27 18:15:12 +11:00
parent 440ff9500b
commit 01cbb795e9
1 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1826,7 +1826,7 @@ static bool load_skin_bitmaps(struct wps_data *wps_data, char *bmpdir)
{
struct wps_token *token = SKINOFFSETTOPTR(skin_buffer, list->token);
struct gui_img *img = (struct gui_img*)SKINOFFSETTOPTR(skin_buffer, token->value.data);
if (img->bm.data)
if (!img->loaded)
{
if (img->using_preloaded_icons)
{
@ -1835,10 +1835,30 @@ static bool load_skin_bitmaps(struct wps_data *wps_data, char *bmpdir)
}
else
{
img->buflib_handle = load_skin_bmp(wps_data, &img->bm, bmpdir);
char path[MAX_PATH];
int handle;
strcpy(path, img->bm.data);
handle = load_skin_bmp(wps_data, &img->bm, bmpdir);
img->buflib_handle = handle;
img->loaded = img->buflib_handle >= 0;
if (img->loaded)
{
struct skin_token_list *imglist = SKINOFFSETTOPTR(skin_buffer, list->next);
img->subimage_height = img->bm.height / img->num_subimages;
while (imglist)
{
token = SKINOFFSETTOPTR(skin_buffer, imglist->token);
img = (struct gui_img*)SKINOFFSETTOPTR(skin_buffer, token->value.data);
if (!strcmp(path, img->bm.data))
{
img->loaded = true;
img->buflib_handle = handle;
img->subimage_height = img->bm.height / img->num_subimages;
}
imglist = SKINOFFSETTOPTR(skin_buffer, imglist->next);
}
}
else
retval = false;
}