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

some minor changes to checkwps, shouldn't change anything

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24874 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-02-24 05:58:16 +00:00
parent 14f066dc25
commit 0acb38b61c
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1926,7 +1926,10 @@ static bool wps_parse(struct wps_data *data, const char *wps_bufptr, bool debug)
#if defined(DEBUG) || defined(SIMULATOR) #if defined(DEBUG) || defined(SIMULATOR)
if (debug) if (debug)
{
print_debug_info(data, fail, line_number); print_debug_info(data, fail, line_number);
debug_skin_usage();
}
#else #else
(void)debug; (void)debug;
#endif #endif
@ -2175,7 +2178,6 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data,
char *dot = strrchr(buf, '.'); char *dot = strrchr(buf, '.');
strlcpy(bmpdir, buf, dot - buf + 1); strlcpy(bmpdir, buf, dot - buf + 1);
/* load the bitmaps that were found by the parsing */ /* load the bitmaps that were found by the parsing */
if (!load_skin_bitmaps(wps_data, bmpdir)) { if (!load_skin_bitmaps(wps_data, bmpdir)) {
skin_data_reset(wps_data); skin_data_reset(wps_data);

2
apps/settings.h
View file

@ -55,7 +55,7 @@ struct opt_items {
#error ROCKBOX_DIR not defined (should be in autoconf.h) #error ROCKBOX_DIR not defined (should be in autoconf.h)
#endif #endif
#define ROCKBOX_DIR_LEN sizeof(ROCKBOX_DIR) #define ROCKBOX_DIR_LEN sizeof(ROCKBOX_DIR)
#endif #endif /* def __PCTOOL__ */
#define FONT_DIR ROCKBOX_DIR "/fonts" #define FONT_DIR ROCKBOX_DIR "/fonts"

2
tools/checkwps/checkwps.c
View file

@ -170,7 +170,7 @@ void* plugin_get_buffer(size_t *buffer_size)
} }
struct user_settings global_settings = { struct user_settings global_settings = {
.statusbar = true, .statusbar = STATUSBAR_TOP,
#ifdef HAVE_LCD_COLOR #ifdef HAVE_LCD_COLOR
.bg_color = LCD_DEFAULT_BG, .bg_color = LCD_DEFAULT_BG,
.fg_color = LCD_DEFAULT_FG, .fg_color = LCD_DEFAULT_FG,

2
tools/checkwps/checkwps.make
View file

@ -7,7 +7,7 @@
# $Id$ # $Id$
# #
FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" $(TARGET) -Wall FLAGS=-g -D__PCTOOL__ $(TARGET) -Wall
SRC= $(call preprocess, $(TOOLSDIR)/checkwps/SOURCES) SRC= $(call preprocess, $(TOOLSDIR)/checkwps/SOURCES)