[core] Eliminate use of ClassProperties for layout

2015-10-26 10:14:24 -07:00
parent 728a9858ea
commit a562567589
33 changed files with 237 additions and 323 deletions
--- 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;