diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-26 10:14:24 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-11-10 11:33:17 -0800 |
| commit | a5625675890213f94de7632d4ef152ade627c9a5 (patch) | |
| tree | d6a3f816e80417bbedc16d0b34383d8ee191bf92 /src/mbgl/text/shaping.cpp | |
| parent | 728a9858ea88751e74de57694746c2ea1546ce25 (diff) | |
| download | qtlocation-mapboxgl-a5625675890213f94de7632d4ef152ade627c9a5.tar.gz | |
[core] Eliminate use of ClassProperties for layout
Diffstat (limited to 'src/mbgl/text/shaping.cpp')
| -rw-r--r-- | src/mbgl/text/shaping.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/text/shaping.cpp b/src/mbgl/text/shaping.cpp index c3911718e0..6709a49aa2 100644 --- a/src/mbgl/text/shaping.cpp +++ b/src/mbgl/text/shaping.cpp @@ -1,11 +1,11 @@ #include <mbgl/text/shaping.hpp> -#include <mbgl/style/style_properties.hpp> +#include <mbgl/layer/symbol_layer.hpp> namespace mbgl { PositionedIcon shapeIcon(const Rect<uint16_t>& image, const SymbolLayoutProperties& layout) { - float dx = layout.icon.offset[0]; - float dy = layout.icon.offset[1]; + float dx = layout.icon.offset.value[0]; + float dy = layout.icon.offset.value[1]; float x1 = dx - image.originalW / 2.0f; float x2 = x1 + image.originalW; float y1 = dy - image.originalH / 2.0f; |