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/style/layers/symbol_layer_impl.cpp | |
| parent | 939526bac4aff734be4e6382b64c43214eb0bc9b (diff) | |
| download | qtlocation-mapboxgl-d7a55a4be1300d79da0c63aefdf5d48d0c45a404.tar.gz | |
[core] Introduce a fully-evaluated tuple type for layout properties
Diffstat (limited to 'src/mbgl/style/layers/symbol_layer_impl.cpp')
| -rw-r--r-- | src/mbgl/style/layers/symbol_layer_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/style/layers/symbol_layer_impl.cpp b/src/mbgl/style/layers/symbol_layer_impl.cpp index ff59b14d65..e4557c953f 100644 --- a/src/mbgl/style/layers/symbol_layer_impl.cpp +++ b/src/mbgl/style/layers/symbol_layer_impl.cpp @@ -68,7 +68,7 @@ TextPaintProperties::Evaluated SymbolLayer::Impl::textPaintProperties() const { } -SymbolPropertyValues SymbolLayer::Impl::iconPropertyValues(const SymbolLayoutProperties::Evaluated& layout_) const { +SymbolPropertyValues SymbolLayer::Impl::iconPropertyValues(const SymbolLayoutProperties::PossiblyEvaluated& layout_) const { return SymbolPropertyValues { layout_.get<IconRotationAlignment>(), // icon-pitch-alignment is not yet implemented; inherit the rotation alignment layout_.get<IconRotationAlignment>(), @@ -83,7 +83,7 @@ SymbolPropertyValues SymbolLayer::Impl::iconPropertyValues(const SymbolLayoutPro }; } -SymbolPropertyValues SymbolLayer::Impl::textPropertyValues(const SymbolLayoutProperties::Evaluated& layout_) const { +SymbolPropertyValues SymbolLayer::Impl::textPropertyValues(const SymbolLayoutProperties::PossiblyEvaluated& layout_) const { return SymbolPropertyValues { layout_.get<TextPitchAlignment>(), layout_.get<TextRotationAlignment>(), |