diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-30 17:01:52 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-31 14:17:33 -0700 |
| commit | 1a9bccbb850c637583c18e7409e3b87a0dd9ff79 (patch) | |
| tree | cd158e3a469bfcbb1fbeab8efca43fc8ef698765 /src/mbgl/style/layers/symbol_layer.cpp | |
| parent | 743d95405363e0eea1b80e8c28bde245211f7868 (diff) | |
| download | qtlocation-mapboxgl-1a9bccbb850c637583c18e7409e3b87a0dd9ff79.tar.gz | |
[core] Add DDS support for icon-image
Diffstat (limited to 'src/mbgl/style/layers/symbol_layer.cpp')
| -rw-r--r-- | src/mbgl/style/layers/symbol_layer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/style/layers/symbol_layer.cpp b/src/mbgl/style/layers/symbol_layer.cpp index 3a896d4c93..bd5cf30ad6 100644 --- a/src/mbgl/style/layers/symbol_layer.cpp +++ b/src/mbgl/style/layers/symbol_layer.cpp @@ -203,15 +203,15 @@ void SymbolLayer::setIconTextFitPadding(PropertyValue<std::array<float, 4>> valu impl->layout.unevaluated.get<IconTextFitPadding>() = value; impl->observer->onLayerLayoutPropertyChanged(*this, "icon-text-fit-padding"); } -PropertyValue<std::string> SymbolLayer::getDefaultIconImage() { +DataDrivenPropertyValue<std::string> SymbolLayer::getDefaultIconImage() { return IconImage::defaultValue(); } -PropertyValue<std::string> SymbolLayer::getIconImage() const { +DataDrivenPropertyValue<std::string> SymbolLayer::getIconImage() const { return impl->layout.unevaluated.get<IconImage>(); } -void SymbolLayer::setIconImage(PropertyValue<std::string> value) { +void SymbolLayer::setIconImage(DataDrivenPropertyValue<std::string> value) { if (value == getIconImage()) return; impl->layout.unevaluated.get<IconImage>() = value; |