summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/checkwps/SOURCES3
-rw-r--r--tools/checkwps/checkwps.c16
-rw-r--r--tools/convbdf.c11
3 files changed, 29 insertions, 1 deletions
diff --git a/tools/checkwps/SOURCES b/tools/checkwps/SOURCES
index 06ef3b9ee5..6223b97178 100644
--- a/tools/checkwps/SOURCES
+++ b/tools/checkwps/SOURCES
@@ -1,6 +1,9 @@
1../../apps/gui/skin_engine/wps_debug.c 1../../apps/gui/skin_engine/wps_debug.c
2../../apps/gui/skin_engine/skin_parser.c 2../../apps/gui/skin_engine/skin_parser.c
3../../apps/gui/skin_engine/skin_buffer.c 3../../apps/gui/skin_engine/skin_buffer.c
4#ifdef HAVE_LCD_BITMAP
5../../apps/gui/skin_engine/skin_fonts.c
6#endif
4../../apps/gui/viewport.c 7../../apps/gui/viewport.c
5../../apps/misc.c 8../../apps/misc.c
6../../firmware/common/strlcpy.c 9../../firmware/common/strlcpy.c
diff --git a/tools/checkwps/checkwps.c b/tools/checkwps/checkwps.c
index 38a650a878..32b6daa88b 100644
--- a/tools/checkwps/checkwps.c
+++ b/tools/checkwps/checkwps.c
@@ -31,6 +31,7 @@
31#include "settings.h" 31#include "settings.h"
32#include "viewport.h" 32#include "viewport.h"
33#include "file.h" 33#include "file.h"
34#include "font.h"
34 35
35bool debug_wps = true; 36bool debug_wps = true;
36int wps_verbose_level = 0; 37int wps_verbose_level = 0;
@@ -236,6 +237,21 @@ void screen_clear_area(struct screen * display, int xstart, int ystart,
236} 237}
237#endif 238#endif
238 239
240#ifdef HAVE_LCD_BITMAP
241static int loaded_fonts = 0;
242int font_load(struct font* pf, const char *path)
243{
244 int id = SYSTEMFONTCOUNT + loaded_fonts;
245 loaded_fonts++;
246 return id;
247}
248
249void font_unload(int font_id)
250{
251 (void)font_id;
252}
253#endif
254
239int main(int argc, char **argv) 255int main(int argc, char **argv)
240{ 256{
241 int res; 257 int res;
diff --git a/tools/convbdf.c b/tools/convbdf.c
index fd82fb5a73..9e42cb8d01 100644
--- a/tools/convbdf.c
+++ b/tools/convbdf.c
@@ -1393,7 +1393,16 @@ int gen_c_source(struct font* pf, char *path)
1393 " %s /* offset */\n" 1393 " %s /* offset */\n"
1394 " %s\n" 1394 " %s\n"
1395 " %d, /* defaultchar */\n" 1395 " %d, /* defaultchar */\n"
1396 " %d /* bits_size */\n" 1396 " %d, /* bits_size */\n"
1397 " -1, /* font fd */\n"
1398 " 0, /* buffer start */\n"
1399 " 0, /* ^ position */\n"
1400 " 0, /* ^ end */\n"
1401 " 0, /* ^ size */\n"
1402 " {{0,0,0,0,0},0,0,0}, /* cache */\n"
1403 " 0, /* */\n"
1404 " 0, /* */\n"
1405 " 0, /* */\n"
1397 "};\n" 1406 "};\n"
1398 "#endif /* HAVE_LCD_BITMAP */\n", 1407 "#endif /* HAVE_LCD_BITMAP */\n",
1399 pf->maxwidth, pf->height, 1408 pf->maxwidth, pf->height,