aboutsummaryrefslogtreecommitdiffstats
path: root/src/gdisp/mcufont/mf_justify.h
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2018-11-03 10:51:23 +1000
committerinmarket <andrewh@inmarket.com.au>2018-11-03 10:51:23 +1000
commit7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d (patch)
tree95cf152ef65ff19c7b2515b427bbe86b92b611d0 /src/gdisp/mcufont/mf_justify.h
parent8bd70d953bcd3e32ceb4e45a4e561c973726280a (diff)
downloaduGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.tar.gz
uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.tar.bz2
uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.zip
For all source files update integer types to the new gI8 etc type names
Diffstat (limited to 'src/gdisp/mcufont/mf_justify.h')
-rw-r--r--src/gdisp/mcufont/mf_justify.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gdisp/mcufont/mf_justify.h b/src/gdisp/mcufont/mf_justify.h
index 3c7622fc..4e4eda9e 100644
--- a/src/gdisp/mcufont/mf_justify.h
+++ b/src/gdisp/mcufont/mf_justify.h
@@ -29,7 +29,7 @@ enum mf_align_t
* state: Free state variable for use by the callback.
* Returns the width of the character.
*/
-typedef uint8_t (*mf_character_callback_t) (int16_t x0, int16_t y0,
+typedef gU8 (*mf_character_callback_t) (gI16 x0, gI16 y0,
mf_char character, void *state);
/* Get width of a string in pixels.
@@ -39,8 +39,8 @@ typedef uint8_t (*mf_character_callback_t) (int16_t x0, int16_t y0,
* count: Number of characters on the line or 0 to read until end of string.
* kern: True to consider kerning (slower).
*/
-MF_EXTERN int16_t mf_get_string_width(const struct mf_font_s *font,
- mf_str text, uint16_t count, bool kern);
+MF_EXTERN gI16 mf_get_string_width(const struct mf_font_s *font,
+ mf_str text, gU16 count, bool kern);
/* Render a single line of aligned text.
*
@@ -54,9 +54,9 @@ MF_EXTERN int16_t mf_get_string_width(const struct mf_font_s *font,
* state: Free variable for use in the callback.
*/
MF_EXTERN void mf_render_aligned(const struct mf_font_s *font,
- int16_t x0, int16_t y0,
+ gI16 x0, gI16 y0,
enum mf_align_t align,
- mf_str text, uint16_t count,
+ mf_str text, gU16 count,
mf_character_callback_t callback,
void *state);
@@ -72,8 +72,8 @@ MF_EXTERN void mf_render_aligned(const struct mf_font_s *font,
* state: Free variable for use in the callback.
*/
MF_EXTERN void mf_render_justified(const struct mf_font_s *font,
- int16_t x0, int16_t y0, int16_t width,
- mf_str text, uint16_t count,
+ gI16 x0, gI16 y0, gI16 width,
+ mf_str text, gU16 count,
mf_character_callback_t callback,
void *state);