summaryrefslogtreecommitdiff
path: root/include/llmr
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-03-24 15:19:39 +0100
committerKonstantin Käfer <mail@kkaefer.com>2014-03-24 15:19:39 +0100
commit8b573f9fa29b724206c9ec0592525421d3e273c8 (patch)
tree0383c56028e11e8c15b1b647f100d204e2e3c0d9 /include/llmr
parent84ea95988c2625646da407fcc25d52305f6115ab (diff)
downloadqtlocation-mapboxgl-8b573f9fa29b724206c9ec0592525421d3e273c8.tar.gz
fix glyphs that have no pixels but an advance (e.g. spaces)
Diffstat (limited to 'include/llmr')
-rw-r--r--include/llmr/text/glyph.hpp2
-rw-r--r--include/llmr/util/rect.hpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/llmr/text/glyph.hpp b/include/llmr/text/glyph.hpp
index 09b4ddb5a2..91531e24f3 100644
--- a/include/llmr/text/glyph.hpp
+++ b/include/llmr/text/glyph.hpp
@@ -30,7 +30,7 @@ struct Glyph {
: rect(rect), metrics(metrics) {}
operator bool() const {
- return !metrics;
+ return !metrics && !rect;
}
const Rect<uint16_t> rect;
diff --git a/include/llmr/util/rect.hpp b/include/llmr/util/rect.hpp
index 025f3a9cbb..56bab2c9c9 100644
--- a/include/llmr/util/rect.hpp
+++ b/include/llmr/util/rect.hpp
@@ -9,7 +9,7 @@ struct Rect {
T x = 0, y = 0;
T w = 0, h = 0;
- operator bool() const { return w == 0 && h == 0; }
+ operator bool() const { return w == 0 || h == 0; }
};
}