summaryrefslogtreecommitdiff
path: root/glcdgraphics/font.c
diff options
context:
space:
mode:
authormrwastl <mrwastl@users.sourceforge.net>2011-06-03 20:45:27 +0200
committermrwastl <mrwastl@users.sourceforge.net>2011-06-03 20:45:27 +0200
commitf55d4bed0d3c14e4c537ee2b103b465b84b6d955 (patch)
treebd854af875797211818e5907c6645f5c50ecb0e5 /glcdgraphics/font.c
parent9cc601b321b3fac05a6657c861cbba6effe55088 (diff)
downloadgraphlcd-base-f55d4bed0d3c14e4c537ee2b103b465b84b6d955.tar.gz
graphlcd-base-f55d4bed0d3c14e4c537ee2b103b465b84b6d955.tar.bz2
fix another (minor) bug with utf8 and encodedCharAdjustCounter()
Diffstat (limited to 'glcdgraphics/font.c')
-rw-r--r--glcdgraphics/font.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/glcdgraphics/font.c b/glcdgraphics/font.c
index 09d513d..29027d0 100644
--- a/glcdgraphics/font.c
+++ b/glcdgraphics/font.c
@@ -385,12 +385,13 @@ int cFont::Width(const std::string & str, unsigned int len) const
unsigned int symcount=0;
uint32_t c;
- for (i = 0; i < (unsigned int)str.length() && symcount < len; i++)
+ i = 0;
+ while (i < (unsigned int)str.length() && symcount < len)
{
- unsigned int tmp = i;
- encodedCharAdjustCounter(IsUTF8(), str, c, tmp);
+ encodedCharAdjustCounter(IsUTF8(), str, c, i);
symcount++;
sum += Width(c);
+ i++;
}
sum += spaceBetween * (symcount - 1);