aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@seriouslyembedded.com>2015-10-30 16:40:08 +0100
committerJoel Bodenmann <joel@seriouslyembedded.com>2015-10-30 16:40:08 +0100
commit69de17687c304e4699804e6644dd156099de84c6 (patch)
tree924d51efaf30244dc968e166f336a04824e47378
parentf4c46e313d571d703c64707b199666cb13b38cd8 (diff)
downloaduGFX-69de17687c304e4699804e6644dd156099de84c6.tar.gz
uGFX-69de17687c304e4699804e6644dd156099de84c6.tar.bz2
uGFX-69de17687c304e4699804e6644dd156099de84c6.zip
Fixing compiler warnings
pull-request sent to upstream
-rw-r--r--src/gdisp/mcufont/mf_wordwrap.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gdisp/mcufont/mf_wordwrap.c b/src/gdisp/mcufont/mf_wordwrap.c
index ee57ee99..4e2b1d4f 100644
--- a/src/gdisp/mcufont/mf_wordwrap.c
+++ b/src/gdisp/mcufont/mf_wordwrap.c
@@ -130,7 +130,6 @@ static bool append_char(const struct mf_font_s *font, int16_t width,
}
}
-static int16_t abs16(int16_t x) { return (x > 0) ? x : -x; }
static int32_t sq16(int16_t x) { return (int32_t)x * x; }
/* Try to balance the lines by potentially moving one word from the previous
@@ -173,8 +172,8 @@ static void tune_lines(struct linelen_s *current, struct linelen_s *previous,
void mf_wordwrap(const struct mf_font_s *font, int16_t width,
mf_str text, mf_line_callback_t callback, void *state)
{
- struct linelen_s current = {};
- struct linelen_s previous = {};
+ struct linelen_s current;
+ struct linelen_s previous;
bool full;
current.start = text;