diff options
Diffstat (limited to 'src/mbgl/style/layers/line_layer_properties.hpp')
| -rw-r--r-- | src/mbgl/style/layers/line_layer_properties.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/style/layers/line_layer_properties.hpp b/src/mbgl/style/layers/line_layer_properties.hpp index 2ecbb10993..29ba9ec641 100644 --- a/src/mbgl/style/layers/line_layer_properties.hpp +++ b/src/mbgl/style/layers/line_layer_properties.hpp @@ -45,7 +45,7 @@ struct LineColor : DataDrivenPaintProperty<Color, attributes::color, uniforms::c }; struct LineDasharray : CrossFadedPaintProperty<std::vector<float>> { - static std::vector<float> defaultValue() { return { }; } + static std::vector<float> defaultValue() { return {}; } }; struct LineFloorWidth : DataDrivenPaintProperty<float, attributes::floorwidth, uniforms::floorwidth> { @@ -68,12 +68,12 @@ struct LineOpacity : DataDrivenPaintProperty<float, attributes::opacity, uniform static float defaultValue() { return 1; } }; -struct LinePattern : CrossFadedDataDrivenPaintProperty<std::string, attributes::pattern_to, uniforms::pattern_to, attributes::pattern_from, uniforms::pattern_from> { - static std::string defaultValue() { return ""; } +struct LinePattern : CrossFadedDataDrivenPaintProperty<expression::Image, attributes::pattern_to, uniforms::pattern_to, attributes::pattern_from, uniforms::pattern_from> { + static expression::Image defaultValue() { return {}; } }; struct LineTranslate : PaintProperty<std::array<float, 2>> { - static std::array<float, 2> defaultValue() { return {{ 0, 0 }}; } + static std::array<float, 2> defaultValue() { return {{0, 0}}; } }; struct LineTranslateAnchor : PaintProperty<TranslateAnchorType> { |