summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-06-07 03:55:40 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-06-07 03:55:40 +0000
commit32455131e733d1c77e56441b19513148015b8429 (patch)
tree99ed00bb698e9a7b7dea83addc1fd00c7c74a1aa /apps
parent5b0521c9aadee11886e2c92df7d768d5e76063a6 (diff)
downloadrockbox-32455131e733d1c77e56441b19513148015b8429.tar.gz
rockbox-32455131e733d1c77e56441b19513148015b8429.zip
fix errors
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26642 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/skin_engine/skin_parser.c2
-rw-r--r--apps/gui/viewport.c8
2 files changed, 9 insertions, 1 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 2f79c99144..a0519c93a9 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -1026,7 +1026,7 @@ static int parse_viewportcolour(const char *wps_bufptr,
(void)wps_data;
const char *ptr = wps_bufptr;
struct viewport_colour *colour = skin_buffer_alloc(sizeof(struct viewport_colour));
- int set;
+ uint32_t set;
if (*ptr != '(' || !colour)
return -1;
ptr++;
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index 8731015c79..2dce3a397b 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -389,7 +389,11 @@ int get_viewport_default_colour(enum screen_type screen, bool fgcolour)
colour = REMOTE_FG_FALLBACK;
else
#endif
+#if defined(HAVE_LCD_COLOR)
colour = global_settings.fg_color;
+#else
+ colour = FG_FALLBACK;
+#endif
}
else
{
@@ -398,7 +402,11 @@ int get_viewport_default_colour(enum screen_type screen, bool fgcolour)
colour = REMOTE_BG_FALLBACK;
else
#endif
+#if defined(HAVE_LCD_COLOR)
colour = global_settings.bg_color;
+#else
+ colour = BG_FALLBACK;
+#endif
}
#endif /* LCD_DEPTH > 1 || LCD_REMOTE_DEPTH > 1 */
return colour;