diff options
| author | Ansis Brammanis <brammanis@gmail.com> | 2015-05-19 11:09:33 -0400 |
|---|---|---|
| committer | Ansis Brammanis <brammanis@gmail.com> | 2015-05-19 11:09:33 -0400 |
| commit | 7abd7950c96a493bf054631332ab2bbcc4aac016 (patch) | |
| tree | 37d8a7bbe5060e074942f7ed64c24173e1d02127 /src/mbgl/text/glyph.hpp | |
| parent | 4d631623c7d29e8d40720e521e78c3299995b674 (diff) | |
| parent | 5572504d38ddb2cb5e597f9fd256e409ad6dac6d (diff) | |
| download | qtlocation-mapboxgl-7abd7950c96a493bf054631332ab2bbcc4aac016.tar.gz | |
Merge branch 'master' into new-labelling
Conflicts:
src/mbgl/map/tile_parser.cpp
src/mbgl/map/tile_parser.hpp
src/mbgl/renderer/painter.hpp
src/mbgl/renderer/painter_symbol.cpp
src/mbgl/renderer/symbol_bucket.cpp
src/mbgl/renderer/symbol_bucket.hpp
src/mbgl/text/collision.cpp
src/mbgl/text/collision.hpp
src/mbgl/text/placement.cpp
Diffstat (limited to 'src/mbgl/text/glyph.hpp')
| -rw-r--r-- | src/mbgl/text/glyph.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/text/glyph.hpp b/src/mbgl/text/glyph.hpp index bc46042d2a..03016f0fbf 100644 --- a/src/mbgl/text/glyph.hpp +++ b/src/mbgl/text/glyph.hpp @@ -35,7 +35,7 @@ struct Glyph { : rect(rect_), metrics(metrics_) {} operator bool() const { - return metrics || rect; + return metrics || rect.hasArea(); } const Rect<uint16_t> rect; |