[core] Rationalize style property classes: <type>{Paint,Layout}Properties

2015-10-19 13:19:52 -07:00
parent 83d39364f9
commit df89de5cc5
31 changed files with 279 additions and 352 deletions
--- 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;