diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-30 15:56:35 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-31 13:26:27 -0700 |
| commit | d7a55a4be1300d79da0c63aefdf5d48d0c45a404 (patch) | |
| tree | e50f42cdf87fa59c0f71d15892652c0e3424703a /src/mbgl/layout | |
| parent | 939526bac4aff734be4e6382b64c43214eb0bc9b (diff) | |
| download | qtlocation-mapboxgl-d7a55a4be1300d79da0c63aefdf5d48d0c45a404.tar.gz | |
[core] Introduce a fully-evaluated tuple type for layout properties
Diffstat (limited to 'src/mbgl/layout')
| -rw-r--r-- | src/mbgl/layout/symbol_instance.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/layout/symbol_instance.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/layout/symbol_layout.hpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/layout/symbol_instance.cpp b/src/mbgl/layout/symbol_instance.cpp index 8bdc528bbb..2264bfdc92 100644 --- a/src/mbgl/layout/symbol_instance.cpp +++ b/src/mbgl/layout/symbol_instance.cpp @@ -9,7 +9,7 @@ SymbolInstance::SymbolInstance(Anchor& anchor, const GeometryCoordinates& line, const std::pair<Shaping, Shaping>& shapedTextOrientations, const PositionedIcon& shapedIcon, - const SymbolLayoutProperties::Evaluated& layout, + const SymbolLayoutProperties::PossiblyEvaluated& layout, const bool addToBuffers, const uint32_t index_, const float textBoxScale, diff --git a/src/mbgl/layout/symbol_instance.hpp b/src/mbgl/layout/symbol_instance.hpp index 70ebfeefa2..0980eb492b 100644 --- a/src/mbgl/layout/symbol_instance.hpp +++ b/src/mbgl/layout/symbol_instance.hpp @@ -16,7 +16,7 @@ public: const GeometryCoordinates& line, const std::pair<Shaping, Shaping>& shapedTextOrientations, const PositionedIcon& shapedIcon, - const style::SymbolLayoutProperties::Evaluated&, + const style::SymbolLayoutProperties::PossiblyEvaluated&, const bool inside, const uint32_t index, const float textBoxScale, diff --git a/src/mbgl/layout/symbol_layout.hpp b/src/mbgl/layout/symbol_layout.hpp index 5b14090d97..bd72d3cd3f 100644 --- a/src/mbgl/layout/symbol_layout.hpp +++ b/src/mbgl/layout/symbol_layout.hpp @@ -78,7 +78,7 @@ private: const float zoom; const MapMode mode; - style::SymbolLayoutProperties::Evaluated layout; + style::SymbolLayoutProperties::PossiblyEvaluated layout; float textMaxSize; SpriteAtlas& spriteAtlas; |