diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-06-08 14:14:40 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-06-08 14:14:40 +1000 |
| commit | ccde54722f2c284fb0e7fc273d65c57a3be71db1 (patch) | |
| tree | fffa49870c73d7e9d5caaf5c6d1d47cf0e5c90d3 /src/gdisp/mcufont/mf_font.c | |
| parent | e850c344b818f21a2ec286f9c4a149a9cd4ac34b (diff) | |
| download | uGFX-ccde54722f2c284fb0e7fc273d65c57a3be71db1.tar.gz uGFX-ccde54722f2c284fb0e7fc273d65c57a3be71db1.tar.bz2 uGFX-ccde54722f2c284fb0e7fc273d65c57a3be71db1.zip | |
Added ability to compile ugfx as a single file (excluding driver and board files).
Simply compile src/gfx_mk.c
Diffstat (limited to 'src/gdisp/mcufont/mf_font.c')
| -rw-r--r-- | src/gdisp/mcufont/mf_font.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/gdisp/mcufont/mf_font.c b/src/gdisp/mcufont/mf_font.c index 7a4ebf95..ccf71bec 100644 --- a/src/gdisp/mcufont/mf_font.c +++ b/src/gdisp/mcufont/mf_font.c @@ -5,10 +5,18 @@ * http://ugfx.org/license.html */ -#include "mf_font.h" +#include "mf_config.h" #ifndef MF_NO_COMPILE +#define MF_BWFONT_INTERNALS +#define MF_RLEFONT_INTERNALS +#define MF_SCALEDFONT_INTERNALS +#include "mf_font.h" +#include "mf_rlefont.h" +#include "mf_bwfont.h" +#include "mf_scaledfont.h" + #include <stdbool.h> /* This will be made into a list of included fonts using macro magic. */ @@ -40,7 +48,7 @@ uint8_t mf_character_width(const struct mf_font_s *font, mf_char character) { uint8_t width; - width = font->character_width(font, character); + width = font->character_width(font, MFCHAR2UINT16(character)); if (!width) { |