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

Updated the error message when invalid UTF-8 strings are used in love.graphics.print and friends to mention UTF-8.

Browse Source
This commit is contained in:
Alex Szpakowski
2014-10-06 19:34:11 -03:00
parent d3e1993673
commit 1108dea696
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/font/GlyphData.cpp
+1 -1
View File
@@ -106,7 +106,7 @@ std::string GlyphData::getGlyphString() const
} }
catch (utf8::exception &e) catch (utf8::exception &e)
{ {
throw love::Exception("Decoding error: %s", e.what()); throw love::Exception("UTF-8 decoding error: %s", e.what());
} }
// Just in case... // Just in case...
src/modules/font/Rasterizer.cpp
+2 -2
View File
@@ -63,7 +63,7 @@ GlyphData *Rasterizer::getGlyphData(const std::string &text) const
} }
catch (utf8::exception &e) catch (utf8::exception &e)
{ {
throw love::Exception("Decoding error: %s", e.what()); throw love::Exception("UTF-8 decoding error: %s", e.what());
} }
return getGlyphData(codepoint); return getGlyphData(codepoint);
@@ -89,7 +89,7 @@ bool Rasterizer::hasGlyphs(const std::string &text) const
} }
catch (utf8::exception &e) catch (utf8::exception &e)
{ {
throw love::Exception("Decoding error: %s", e.what()); throw love::Exception("UTF-8 decoding error: %s", e.what());
} }
return true; return true;
src/modules/font/freetype/Font.cpp
+2 -2
View File
@@ -66,7 +66,7 @@ Rasterizer *Font::newRasterizer(love::image::ImageData *data, const std::string
catch (utf8::exception &e) catch (utf8::exception &e)
{ {
delete [] glyphs; delete [] glyphs;
throw love::Exception("Decoding error: %s", e.what()); throw love::Exception("UTF-8 decoding error: %s", e.what());
} }
Rasterizer *r = newRasterizer(data, glyphs, numglyphs); Rasterizer *r = newRasterizer(data, glyphs, numglyphs);
@@ -90,7 +90,7 @@ GlyphData *Font::newGlyphData(Rasterizer *r, const std::string &text)
} }
catch (utf8::exception &e) catch (utf8::exception &e)
{ {
throw love::Exception("Decoding error: %s", e.what()); throw love::Exception("UTF-8 decoding error: %s", e.what());
} }
return r->getGlyphData(codepoint); return r->getGlyphData(codepoint);
src/modules/graphics/opengl/Font.cpp
+2 -2
View File
@@ -367,7 +367,7 @@ void Font::print(const std::string &text, float x, float y, float extra_spacing,
} }
catch (utf8::exception &e) catch (utf8::exception &e)
{ {
throw love::Exception("Decoding error: %s", e.what()); throw love::Exception("UTF-8 decoding error: %s", e.what());
} }
if (vertexcount <= 0 || glyphinfolist.size() == 0) if (vertexcount <= 0 || glyphinfolist.size() == 0)
@@ -429,7 +429,7 @@ int Font::getWidth(const std::string &str)
} }
catch(utf8::exception &e) catch(utf8::exception &e)
{ {
throw love::Exception("Decoding error: %s", e.what()); throw love::Exception("UTF-8 decoding error: %s", e.what());
} }
if (width > max_width) if (width > max_width)