From 75ce9606a122bd625f010d574256806d67c1e696 Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Tue, 24 Nov 2009 21:34:24 +0000 Subject: Limit character width to 255 pixels Use intermediate variable to fix yellow and red git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23744 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/lcd-bitmap-common.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'firmware/drivers/lcd-bitmap-common.c') diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index 7a072894b2..3853912640 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c @@ -84,8 +84,8 @@ struct lcd_bitmap_char { char is_rtl; char is_diacritic; - unsigned short int width; - unsigned short base_width; + unsigned char width; + unsigned char base_width; }; /* put a string at a given pixel position, skipping first ofs pixel columns */ @@ -120,7 +120,11 @@ static void LCDFN(putsxyofs)(int x, int y, int ofs, const unsigned char *str) ucs = bidi_l2v(str, 1); /* Mark diacritic and rtl flags for each character */ for (i = 0; i < SCROLL_LINE_SIZE && ucs[i]; i++) - chars[i].is_diacritic = is_diacritic(ucs[i], &chars[i].is_rtl); + { + bool is_rtl; + chars[i].is_diacritic = is_diacritic(ucs[i], &is_rtl); + chars[i].is_rtl=is_rtl; + } len = i; /* Get proportional width and glyph bits */ -- cgit v1.2.3