summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2009-11-24 21:34:24 +0000
committerFrank Gevaerts <frank@gevaerts.be>2009-11-24 21:34:24 +0000
commit75ce9606a122bd625f010d574256806d67c1e696 (patch)
tree91b5c4e03579f93ea8f65fdde6e10be44be2d301
parenta68ad9e52152583800ed302d07de8bf4b56f9e23 (diff)
downloadrockbox-75ce9606a122bd625f010d574256806d67c1e696.zip
rockbox-75ce9606a122bd625f010d574256806d67c1e696.tar.gz
rockbox-75ce9606a122bd625f010d574256806d67c1e696.tar.bz2
rockbox-75ce9606a122bd625f010d574256806d67c1e696.tar.xz
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
-rw-r--r--apps/plugins/SOURCES2
-rw-r--r--firmware/drivers/lcd-bitmap-common.c10
2 files changed, 9 insertions, 3 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 4b60562..434ef31 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -1,3 +1,5 @@
+test_disk.c
+test_gfx.c
/* plugins common to all models */
chessclock.c
credits.c
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index 7a07289..3853912 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 */