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 /include | |
| parent | 743d95405363e0eea1b80e8c28bde245211f7868 (diff) | |
| download | qtlocation-mapboxgl-1a9bccbb850c637583c18e7409e3b87a0dd9ff79.tar.gz | |
[core] Add DDS support for icon-image
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/style/conversion/make_property_setters.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/style/layers/symbol_layer.hpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/mbgl/style/conversion/make_property_setters.hpp b/include/mbgl/style/conversion/make_property_setters.hpp index 78c2fabebc..85bcd44cf3 100644 --- a/include/mbgl/style/conversion/make_property_setters.hpp +++ b/include/mbgl/style/conversion/make_property_setters.hpp @@ -40,7 +40,7 @@ auto makeLayoutPropertySetters() { result["icon-size"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setIconSize>; result["icon-text-fit"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<IconTextFitType>, &SymbolLayer::setIconTextFit>; result["icon-text-fit-padding"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<std::array<float, 4>>, &SymbolLayer::setIconTextFitPadding>; - result["icon-image"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<std::string>, &SymbolLayer::setIconImage>; + result["icon-image"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<std::string>, &SymbolLayer::setIconImage>; result["icon-rotate"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setIconRotate>; result["icon-padding"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setIconPadding>; result["icon-keep-upright"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setIconKeepUpright>; diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index 23bdf303b6..853a71bef2 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_layer.hpp @@ -71,9 +71,9 @@ public: PropertyValue<std::array<float, 4>> getIconTextFitPadding() const; void setIconTextFitPadding(PropertyValue<std::array<float, 4>>); - static PropertyValue<std::string> getDefaultIconImage(); - PropertyValue<std::string> getIconImage() const; - void setIconImage(PropertyValue<std::string>); + static DataDrivenPropertyValue<std::string> getDefaultIconImage(); + DataDrivenPropertyValue<std::string> getIconImage() const; + void setIconImage(DataDrivenPropertyValue<std::string>); static DataDrivenPropertyValue<float> getDefaultIconRotate(); DataDrivenPropertyValue<float> getIconRotate() const; |