From 1108dea69689183d3b0671cd7aa73f79f555f0d8 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Mon, 6 Oct 2014 19:34:11 -0300 Subject: [PATCH] Updated the error message when invalid UTF-8 strings are used in love.graphics.print and friends to mention UTF-8. --- src/modules/font/GlyphData.cpp | 2 +- src/modules/font/Rasterizer.cpp | 4 ++-- src/modules/font/freetype/Font.cpp | 4 ++-- src/modules/graphics/opengl/Font.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/font/GlyphData.cpp b/src/modules/font/GlyphData.cpp index 7ed2b3db2..efaa7100d 100644 --- a/src/modules/font/GlyphData.cpp +++ b/src/modules/font/GlyphData.cpp @@ -106,7 +106,7 @@ std::string GlyphData::getGlyphString() const } 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... diff --git a/src/modules/font/Rasterizer.cpp b/src/modules/font/Rasterizer.cpp index cec9f0bef..de8e05328 100644 --- a/src/modules/font/Rasterizer.cpp +++ b/src/modules/font/Rasterizer.cpp @@ -63,7 +63,7 @@ GlyphData *Rasterizer::getGlyphData(const std::string &text) const } 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); @@ -89,7 +89,7 @@ bool Rasterizer::hasGlyphs(const std::string &text) const } catch (utf8::exception &e) { - throw love::Exception("Decoding error: %s", e.what()); + throw love::Exception("UTF-8 decoding error: %s", e.what()); } return true; diff --git a/src/modules/font/freetype/Font.cpp b/src/modules/font/freetype/Font.cpp index ece8e8ddb..62b78d3b3 100644 --- a/src/modules/font/freetype/Font.cpp +++ b/src/modules/font/freetype/Font.cpp @@ -66,7 +66,7 @@ Rasterizer *Font::newRasterizer(love::image::ImageData *data, const std::string catch (utf8::exception &e) { 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); @@ -90,7 +90,7 @@ GlyphData *Font::newGlyphData(Rasterizer *r, const std::string &text) } 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); diff --git a/src/modules/graphics/opengl/Font.cpp b/src/modules/graphics/opengl/Font.cpp index df19f875d..0acf1572a 100644 --- a/src/modules/graphics/opengl/Font.cpp +++ b/src/modules/graphics/opengl/Font.cpp @@ -367,7 +367,7 @@ void Font::print(const std::string &text, float x, float y, float extra_spacing, } 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) @@ -429,7 +429,7 @@ int Font::getWidth(const std::string &str) } 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)