diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-26 16:39:56 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-02 14:51:39 -0700 |
| commit | c902f9098b331302aaa1baac77d1575db624a132 (patch) | |
| tree | 211901cd04454aedbac40c469198438e46d7038c /src/mbgl/text/shaping.cpp | |
| parent | 18149cbcc27a926f280b08d8d0e09104b2147688 (diff) | |
| download | qtlocation-mapboxgl-c902f9098b331302aaa1baac77d1575db624a132.tar.gz | |
[core] Rationalize naming for style-related code
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 ce93b4977e..1091cd6e94 100644 --- a/src/mbgl/text/shaping.cpp +++ b/src/mbgl/text/shaping.cpp @@ -1,9 +1,9 @@ #include <mbgl/text/shaping.hpp> -#include <mbgl/layer/symbol_layer_properties.hpp> +#include <mbgl/style/layers/symbol_layer_properties.hpp> namespace mbgl { -PositionedIcon shapeIcon(const SpriteAtlasElement& image, const SymbolLayoutProperties& layout) { +PositionedIcon shapeIcon(const SpriteAtlasElement& image, const style::SymbolLayoutProperties& layout) { float dx = layout.iconOffset.value[0]; float dy = layout.iconOffset.value[1]; float x1 = dx - image.spriteImage->getWidth() / 2.0f; |