summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <thiago@mapbox.com>2015-05-27 16:16:07 +0300
committerThiago Marcos P. Santos <thiago@mapbox.com>2015-05-28 09:33:08 +0300
commit48875d8d6ccabd344d95be15f8537b0c8c8f7f18 (patch)
tree2cced9e904eba54801c07f499043a54ce72f1f47 /src
parent4819379020f88d2cf34774dfb6aca0ca16aa53ca (diff)
downloadqtlocation-mapboxgl-48875d8d6ccabd344d95be15f8537b0c8c8f7f18.tar.gz
Notify glyph parsing errors
Emit a signal when the glyphs are not parsed correctly.
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/text/glyph_pbf.cpp4
-rw-r--r--src/mbgl/text/glyph_pbf.hpp5
-rw-r--r--src/mbgl/text/glyph_store.cpp10
3 files changed, 15 insertions, 4 deletions
diff --git a/src/mbgl/text/glyph_pbf.cpp b/src/mbgl/text/glyph_pbf.cpp
index c0642af290..899df39d38 100644
--- a/src/mbgl/text/glyph_pbf.cpp
+++ b/src/mbgl/text/glyph_pbf.cpp
@@ -23,14 +23,14 @@ GlyphPBF::GlyphPBF(const std::string& glyphURL,
const GlyphLoadingFailedCallback& failureCallback)
: parsed(false), env(env_) {
// Load the glyph set URL
- std::string url = util::replaceTokens(glyphURL, [&](const std::string &name) -> std::string {
+ url = util::replaceTokens(glyphURL, [&](const std::string &name) -> std::string {
if (name == "fontstack") return util::percentEncode(fontStack);
if (name == "range") return util::toString(glyphRange.first) + "-" + util::toString(glyphRange.second);
return "";
});
// The prepare call jumps back to the main thread.
- req = env.request({ Resource::Kind::Glyphs, url }, [&, url, successCallback, failureCallback](const Response &res) {
+ req = env.request({ Resource::Kind::Glyphs, url }, [&, successCallback, failureCallback](const Response &res) {
req = nullptr;
if (res.status != Response::Successful) {
diff --git a/src/mbgl/text/glyph_pbf.hpp b/src/mbgl/text/glyph_pbf.hpp
index cb36dde03e..bb6fa83ae6 100644
--- a/src/mbgl/text/glyph_pbf.hpp
+++ b/src/mbgl/text/glyph_pbf.hpp
@@ -29,6 +29,10 @@ public:
void parse(FontStack &stack);
bool isParsed() const;
+ std::string getURL() const {
+ return url;
+ }
+
private:
GlyphPBF(const GlyphPBF &) = delete;
GlyphPBF(GlyphPBF &&) = delete;
@@ -36,6 +40,7 @@ private:
GlyphPBF &operator=(GlyphPBF &&) = delete;
std::string data;
+ std::string url;
std::atomic<bool> parsed;
Environment& env;
diff --git a/src/mbgl/text/glyph_store.cpp b/src/mbgl/text/glyph_store.cpp
index ea451e278d..9520b63c06 100644
--- a/src/mbgl/text/glyph_store.cpp
+++ b/src/mbgl/text/glyph_store.cpp
@@ -34,8 +34,14 @@ bool GlyphStore::requestGlyphRangesIfNeeded(const std::string& fontStackName,
auto successCallback = [this, fontStackName](GlyphPBF* glyph) {
auto fontStack = createFontStack(fontStackName);
- glyph->parse(**fontStack);
- asyncEmitGlyphRangeLoaded->send();
+ try {
+ glyph->parse(**fontStack);
+ asyncEmitGlyphRangeLoaded->send();
+ } catch (const std::exception&) {
+ std::lock_guard<std::mutex> lock(errorMessageMutex);
+ errorMessage = "Failed to parse [" + glyph->getURL() + "]";
+ asyncEmitGlyphRangeLoadedingFailed->send();
+ }
};
auto failureCallback = [this](const std::string& message) {