summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-10-26 18:06:36 -0700
committerKonstantin Käfer <mail@kkaefer.com>2016-11-01 18:41:52 +0100
commited155460d3ec3777bfd95ce3d40c809e583b07de (patch)
treece362d4154cc300b75d78ff8051ebf782834f044 /src/mbgl/renderer
parent7b50cac49f353524457e16d3f342299e0886e963 (diff)
downloadqtlocation-mapboxgl-ed155460d3ec3777bfd95ce3d40c809e583b07de.tar.gz
[core] convert LineAtlas to use managed texture handling
Diffstat (limited to 'src/mbgl/renderer')
-rw-r--r--src/mbgl/renderer/painter_line.cpp2
-rw-r--r--src/mbgl/renderer/painter_symbol.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp
index 9fa6b15559..377c956e7c 100644
--- a/src/mbgl/renderer/painter_line.cpp
+++ b/src/mbgl/renderer/painter_line.cpp
@@ -55,7 +55,7 @@ void Painter::renderLine(PaintParameters& parameters,
posA,
posB,
layer.impl->dashLineWidth,
- lineAtlas->width));
+ lineAtlas->getSize().width));
} else if (!properties.linePattern.value.from.empty()) {
optional<SpriteAtlasPosition> posA = spriteAtlas->getPosition(
diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp
index e13c04120c..9e3638a3a8 100644
--- a/src/mbgl/renderer/painter_symbol.cpp
+++ b/src/mbgl/renderer/painter_symbol.cpp
@@ -101,7 +101,7 @@ void Painter::renderSymbol(PaintParameters& parameters,
auto values = layer.impl->textPropertyValues(layout);
- const Size texsize = glyphAtlas->getSize()x§;
+ const Size texsize = glyphAtlas->getSize();
if (values.hasHalo()) {
draw(parameters.shaders.symbolGlyph,