diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2007-04-17 01:03:25 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2007-04-17 01:03:25 +0000 |
| commit | 79a8b415132302f7f8762bb31f5ffd2b0858cf7a (patch) | |
| tree | 0fddc8f897f89c5e96386156a80ed145fb043095 /apps/gui | |
| parent | f87eaf3c4eacd51d381b66d1d838e498142dbd40 (diff) | |
| download | rockbox-79a8b415132302f7f8762bb31f5ffd2b0858cf7a.zip rockbox-79a8b415132302f7f8762bb31f5ffd2b0858cf7a.tar.gz rockbox-79a8b415132302f7f8762bb31f5ffd2b0858cf7a.tar.bz2 rockbox-79a8b415132302f7f8762bb31f5ffd2b0858cf7a.tar.xz | |
Fix loadable remote icons. fb_data != fb_remote_data ...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13190 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
| -rw-r--r-- | apps/gui/icon.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/gui/icon.c b/apps/gui/icon.c index 2efaed9..8957a5a 100644 --- a/apps/gui/icon.c +++ b/apps/gui/icon.c @@ -194,6 +194,7 @@ static void load_icons(const char* filename, enum Iconset iconset, int size_read; bool *loaded_ok = NULL; struct bitmap *bmp = NULL; + int bmpformat = (FORMAT_NATIVE|FORMAT_DITHER); if (!(*filename)) { @@ -217,11 +218,13 @@ static void load_icons(const char* filename, enum Iconset iconset, loaded_ok = &custom_icons_loaded[SCREEN_REMOTE]; bmp = &user_iconset[SCREEN_REMOTE]; bmp->data = icon_buffer[SCREEN_REMOTE]; + bmpformat |= FORMAT_REMOTE; break; case Iconset_Remotescreen_viewers: loaded_ok = &viewer_icons_loaded[SCREEN_REMOTE]; bmp = &viewer_iconset[SCREEN_REMOTE]; bmp->data = viewer_icon_buffer[SCREEN_REMOTE]; + bmpformat |= FORMAT_REMOTE; break; #endif } @@ -232,8 +235,7 @@ static void load_icons(const char* filename, enum Iconset iconset, char path[MAX_PATH]; snprintf(path, sizeof(path), "%s/%s.bmp", ICON_DIR, filename); - size_read = read_bmp_file(path, bmp, IMG_BUFSIZE, - FORMAT_NATIVE | FORMAT_DITHER); + size_read = read_bmp_file(path, bmp, IMG_BUFSIZE, bmpformat); if (size_read > 0) { *loaded_ok = true; |