diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-19 13:19:52 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-22 09:21:30 -0700 |
| commit | df89de5cc5bf043ca2fe57ef4dd9a7b5d25464cb (patch) | |
| tree | ecac13b203cd45451aeff565cb11b179a5ef84d6 /src/mbgl/text/shaping.cpp | |
| parent | 83d39364f9de987d7840900db2e01673bc1ed6ef (diff) | |
| download | qtlocation-mapboxgl-df89de5cc5bf043ca2fe57ef4dd9a7b5d25464cb.tar.gz | |
[core] Rationalize style property classes: <type>{Paint,Layout}Properties
Diffstat (limited to 'src/mbgl/text/shaping.cpp')
| -rw-r--r-- | src/mbgl/text/shaping.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/text/shaping.cpp b/src/mbgl/text/shaping.cpp index 35fe5dc24b..c3911718e0 100644 --- a/src/mbgl/text/shaping.cpp +++ b/src/mbgl/text/shaping.cpp @@ -1,9 +1,9 @@ #include <mbgl/text/shaping.hpp> -#include <mbgl/style/style_layout.hpp> +#include <mbgl/style/style_properties.hpp> namespace mbgl { -PositionedIcon shapeIcon(const Rect<uint16_t> &image, const StyleLayoutSymbol &layout) { +PositionedIcon shapeIcon(const Rect<uint16_t>& image, const SymbolLayoutProperties& layout) { float dx = layout.icon.offset[0]; float dy = layout.icon.offset[1]; float x1 = dx - image.originalW / 2.0f; |