diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2009-11-24 21:34:24 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2009-11-24 21:34:24 +0000 |
commit | 75ce9606a122bd625f010d574256806d67c1e696 (patch) | |
tree | 91b5c4e03579f93ea8f65fdde6e10be44be2d301 /firmware/drivers/lcd-bitmap-common.c | |
parent | a68ad9e52152583800ed302d07de8bf4b56f9e23 (diff) | |
download | rockbox-75ce9606a122bd625f010d574256806d67c1e696.tar.gz rockbox-75ce9606a122bd625f010d574256806d67c1e696.zip |
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
Diffstat (limited to 'firmware/drivers/lcd-bitmap-common.c')
-rw-r--r-- | firmware/drivers/lcd-bitmap-common.c | 10 |
1 files changed, 7 insertions, 3 deletions
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 | |||
84 | { | 84 | { |
85 | char is_rtl; | 85 | char is_rtl; |
86 | char is_diacritic; | 86 | char is_diacritic; |
87 | unsigned short int width; | 87 | unsigned char width; |
88 | unsigned short base_width; | 88 | unsigned char base_width; |
89 | }; | 89 | }; |
90 | 90 | ||
91 | /* put a string at a given pixel position, skipping first ofs pixel columns */ | 91 | /* 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) | |||
120 | ucs = bidi_l2v(str, 1); | 120 | ucs = bidi_l2v(str, 1); |
121 | /* Mark diacritic and rtl flags for each character */ | 121 | /* Mark diacritic and rtl flags for each character */ |
122 | for (i = 0; i < SCROLL_LINE_SIZE && ucs[i]; i++) | 122 | for (i = 0; i < SCROLL_LINE_SIZE && ucs[i]; i++) |
123 | chars[i].is_diacritic = is_diacritic(ucs[i], &chars[i].is_rtl); | 123 | { |
124 | bool is_rtl; | ||
125 | chars[i].is_diacritic = is_diacritic(ucs[i], &is_rtl); | ||
126 | chars[i].is_rtl=is_rtl; | ||
127 | } | ||
124 | len = i; | 128 | len = i; |
125 | 129 | ||
126 | /* Get proportional width and glyph bits */ | 130 | /* Get proportional width and glyph bits */ |