From 8f3feda719176cfd9f3101365bec11bb9d4cc13e Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Mon, 7 Mar 2011 13:09:04 +0000 Subject: last of the errors... hopefully git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29537 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_parser.c | 6 +++++- apps/gui/skin_engine/wps_internals.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index ff53f75..c09bed6 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -125,7 +125,7 @@ void *skin_find_item(const char *label, enum skin_find_what what, union { struct skin_token_list *linkedlist; struct skin_element *vplist; - } list; + } list = {NULL}; bool isvplist = false; void *ret = NULL; switch (what) @@ -135,9 +135,11 @@ void *skin_find_item(const char *label, enum skin_find_what what, list.vplist = data->tree; isvplist = true; break; +#ifdef HAVE_LCD_BITMAP case SKIN_FIND_IMAGE: list.linkedlist = data->images; break; +#endif #ifdef HAVE_TOUCHSCREEN case SKIN_FIND_TOUCHREGION: list.linkedlist = data->touchregions; @@ -157,10 +159,12 @@ void *skin_find_item(const char *label, enum skin_find_what what, skip = !(((struct skin_viewport *)ret)->is_infovp == (what==SKIN_FIND_UIVP)); break; +#ifdef HAVE_LCD_BITMAP case SKIN_FIND_IMAGE: ret = list.linkedlist->token->value.data; itemlabel = ((struct gui_img *)ret)->label; break; +#endif #ifdef HAVE_TOUCHSCREEN case SKIN_FIND_TOUCHREGION: ret = list.linkedlist->token->value.data; diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index 48c1f9d..47453ed 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h @@ -367,7 +367,9 @@ const char *get_radio_token(struct wps_token *token, int preset_offset, enum skin_find_what { SKIN_FIND_VP = 0, SKIN_FIND_UIVP, +#ifdef HAVE_LCD_BITMAP SKIN_FIND_IMAGE, +#endif #ifdef HAVE_TOUCHSCREEN SKIN_FIND_TOUCHREGION, #endif -- cgit v1.1