diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-13 17:02:30 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-20 12:35:00 -0700 |
commit | af89318b1d3bef15e92e591887c9d65b10be54ce (patch) | |
tree | d3ccb07da91bb56197607f5319100e64f7493211 /src/mbgl/style/conversion/light.cpp | |
parent | a3d988ab8520ea12272bb80a746a2d91cbc332f5 (diff) | |
download | qtlocation-mapboxgl-af89318b1d3bef15e92e591887c9d65b10be54ce.tar.gz |
[core] Convert token strings to expressions
Diffstat (limited to 'src/mbgl/style/conversion/light.cpp')
-rw-r--r-- | src/mbgl/style/conversion/light.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/style/conversion/light.cpp b/src/mbgl/style/conversion/light.cpp index f521f74386..57b61eb340 100644 --- a/src/mbgl/style/conversion/light.cpp +++ b/src/mbgl/style/conversion/light.cpp @@ -18,7 +18,7 @@ optional<Light> Converter<Light>::operator()(const Convertible& value, Error& er const auto anchor = objectMember(value, "anchor"); if (anchor) { optional<PropertyValue<LightAnchorType>> convertedAnchor = - convert<PropertyValue<LightAnchorType>>(*anchor, error); + convert<PropertyValue<LightAnchorType>>(*anchor, error, false); if (convertedAnchor) { light.setAnchor(*convertedAnchor); @@ -41,7 +41,7 @@ optional<Light> Converter<Light>::operator()(const Convertible& value, Error& er const auto color = objectMember(value, "color"); if (color) { optional<PropertyValue<Color>> convertedColor = - convert<PropertyValue<Color>>(*color, error); + convert<PropertyValue<Color>>(*color, error, false); if (convertedColor) { light.setColor(*convertedColor); @@ -64,7 +64,7 @@ optional<Light> Converter<Light>::operator()(const Convertible& value, Error& er const auto position = objectMember(value, "position"); if (position) { optional<PropertyValue<Position>> convertedPosition = - convert<PropertyValue<Position>>(*position, error); + convert<PropertyValue<Position>>(*position, error, false); if (convertedPosition) { light.setPosition(*convertedPosition); @@ -87,7 +87,7 @@ optional<Light> Converter<Light>::operator()(const Convertible& value, Error& er const auto intensity = objectMember(value, "intensity"); if (intensity) { optional<PropertyValue<float>> convertedIntensity = - convert<PropertyValue<float>>(*intensity, error); + convert<PropertyValue<float>>(*intensity, error, false); if (convertedIntensity) { light.setIntensity(*convertedIntensity); |