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_scaledfont.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_scaledfont.c')
-rw-r--r-- | src/gdisp/mcufont/mf_scaledfont.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gdisp/mcufont/mf_scaledfont.c b/src/gdisp/mcufont/mf_scaledfont.c index 4f9de208..570baef6 100644 --- a/src/gdisp/mcufont/mf_scaledfont.c +++ b/src/gdisp/mcufont/mf_scaledfont.c @@ -36,7 +36,7 @@ static void scaled_pixel_callback(int16_t x, int16_t y, uint8_t count, } uint8_t mf_scaled_character_width(const struct mf_font_s *font, - mf_char character) + uint16_t character) { struct mf_scaledfont_s *sfont = (struct mf_scaledfont_s*)font; uint8_t basewidth; @@ -48,7 +48,7 @@ uint8_t mf_scaled_character_width(const struct mf_font_s *font, uint8_t mf_scaled_render_character(const struct mf_font_s *font, int16_t x0, int16_t y0, - mf_char character, + uint16_t character, mf_pixel_callback_t callback, void *state) { |