LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 11:00:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fail gracefully on a utf-8 decoding error (bug #244)

Browse Source
This commit is contained in:
Bart van Strien
2011-06-24 01:18:48 +02:00
parent a012a4408e
commit b90771d44a
2 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Font.cpp
+24 -16
View File
@@ -149,24 +149,32 @@ namespace opengl
glTranslatef(ceil(x), ceil(y), 0.0f);
glRotatef(LOVE_TODEG(angle), 0, 0, 1.0f);
glScalef(sx, sy, 1.0f);
utf8::iterator<std::string::iterator> i (text.begin(), text.begin(), text.end());
utf8::iterator<std::string::iterator> end (text.end(), text.begin(), text.end());
while (i != end) {
int g = *i++;
if (g == '\n') { // wrap newline, but do not print it
glTranslatef(-dx, floor(getHeight() * getLineHeight() + 0.5f), 0);
dx = 0.0f;
continue;
try
{
utf8::iterator<std::string::iterator> i (text.begin(), text.begin(), text.end());
utf8::iterator<std::string::iterator> end (text.end(), text.begin(), text.end());
while (i != end) {
int g = *i++;
if (g == '\n') { // wrap newline, but do not print it
glTranslatef(-dx, floor(getHeight() * getLineHeight() + 0.5f), 0);
dx = 0.0f;
continue;
}
Glyph * glyph = glyphs[g];
if (!glyph) glyph = addGlyph(g);
glPushMatrix();
// 1.25 is magic line height for true type fonts
if (type == FONT_TRUETYPE) glTranslatef(0, floor(getHeight() / 1.25f + 0.5f), 0);
glCallList(glyph->list);
glPopMatrix();
glTranslatef(static_cast<GLfloat>(glyph->spacing), 0, 0);
dx += glyph->spacing;
}
Glyph * glyph = glyphs[g];
if (!glyph) glyph = addGlyph(g);
glPushMatrix();
// 1.25 is magic line height for true type fonts
if (type == FONT_TRUETYPE) glTranslatef(0, floor(getHeight() / 1.25f + 0.5f), 0);
glCallList(glyph->list);
}
catch (utf8::invalid_utf8 e)
{
glPopMatrix();
glTranslatef(static_cast<GLfloat>(glyph->spacing), 0, 0);
dx += glyph->spacing;
throw love::Exception(e.what());
}
glPopMatrix();
}
src/modules/graphics/opengl/wrap_Graphics.cpp
+16 -2
View File
@@ -759,7 +759,14 @@ namespace opengl
float angle = (float)luaL_optnumber(L, 4, 0.0f);
float sx = (float)luaL_optnumber(L, 5, 1.0f);
float sy = (float)luaL_optnumber(L, 6, sx);
instance->print(str, x, y, angle, sx, sy);
try
{
instance->print(str, x, y, angle, sx, sy);
}
catch (love::Exception e)
{
return luaL_error(L, "Decoding error: %s", e.what());
}
return 0;
}
@@ -779,7 +786,14 @@ namespace opengl
return luaL_error(L, "Incorrect alignment: %s", str);
}
instance->printf(str, x, y, wrap, align);
try
{
instance->printf(str, x, y, wrap, align);
}
catch (love::Exception e)
{
return luaL_error(L, "Decoding error: %s", e.what());
}
return 0;
}