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

Fix loadable remote icons. fb_data != fb_remote_data ...

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13190 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2007-04-17 01:03:25 +00:00
parent f87eaf3c4e
commit 79a8b41513
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/gui/icon.c
View file

@ -194,6 +194,7 @@ static void load_icons(const char* filename, enum Iconset iconset,
int size_read; int size_read;
bool *loaded_ok = NULL; bool *loaded_ok = NULL;
struct bitmap *bmp = NULL; struct bitmap *bmp = NULL;
int bmpformat = (FORMAT_NATIVE|FORMAT_DITHER);
if (!(*filename)) if (!(*filename))
{ {
@ -217,11 +218,13 @@ static void load_icons(const char* filename, enum Iconset iconset,
loaded_ok = &custom_icons_loaded[SCREEN_REMOTE]; loaded_ok = &custom_icons_loaded[SCREEN_REMOTE];
bmp = &user_iconset[SCREEN_REMOTE]; bmp = &user_iconset[SCREEN_REMOTE];
bmp->data = icon_buffer[SCREEN_REMOTE]; bmp->data = icon_buffer[SCREEN_REMOTE];
bmpformat |= FORMAT_REMOTE;
break; break;
case Iconset_Remotescreen_viewers: case Iconset_Remotescreen_viewers:
loaded_ok = &viewer_icons_loaded[SCREEN_REMOTE]; loaded_ok = &viewer_icons_loaded[SCREEN_REMOTE];
bmp = &viewer_iconset[SCREEN_REMOTE]; bmp = &viewer_iconset[SCREEN_REMOTE];
bmp->data = viewer_icon_buffer[SCREEN_REMOTE]; bmp->data = viewer_icon_buffer[SCREEN_REMOTE];
bmpformat |= FORMAT_REMOTE;
break; break;
#endif #endif
} }
@ -232,8 +235,7 @@ static void load_icons(const char* filename, enum Iconset iconset,
char path[MAX_PATH]; char path[MAX_PATH];
snprintf(path, sizeof(path), "%s/%s.bmp", ICON_DIR, filename); snprintf(path, sizeof(path), "%s/%s.bmp", ICON_DIR, filename);
size_read = read_bmp_file(path, bmp, IMG_BUFSIZE, size_read = read_bmp_file(path, bmp, IMG_BUFSIZE, bmpformat);
FORMAT_NATIVE | FORMAT_DITHER);
if (size_read > 0) if (size_read > 0)
{ {
*loaded_ok = true; *loaded_ok = true;