diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-08-19 11:38:26 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-08-19 11:38:26 +0200 |
commit | d147e18153910d4f21eaece75e06725b1249c8f2 (patch) | |
tree | 20cefbfca807774a40270127f7f2da685e97ed7e /src/style | |
parent | dbf6d7bcb5502ab7529a0b9b7bfd59c2d2e10944 (diff) | |
download | qtlocation-mapboxgl-d147e18153910d4f21eaece75e06725b1249c8f2.tar.gz |
update mapbox/variant
Diffstat (limited to 'src/style')
-rw-r--r-- | src/style/style_layer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/style/style_layer.cpp b/src/style/style_layer.cpp index d4e6d19db4..4994cf3efa 100644 --- a/src/style/style_layer.cpp +++ b/src/style/style_layer.cpp @@ -105,7 +105,7 @@ struct PropertyEvaluator { } T operator()(const Function<T> &value) const { - return util::apply_visitor(FunctionEvaluator<T>(z), value); + return mapbox::util::apply_visitor(FunctionEvaluator<T>(z), value); } template <typename P, typename std::enable_if<!std::is_convertible<P, T>::value, int>::type = 0> @@ -146,11 +146,11 @@ void StyleLayer::applyStyleProperty(PropertyKey key, T &target, const float z, c for (AppliedClassProperty &property : applied.properties) { if (now >= property.end) { // We overwrite the current property with the new value. - target = util::apply_visitor(evaluator, property.value); + target = mapbox::util::apply_visitor(evaluator, property.value); } else if (now >= property.begin) { // We overwrite the current property partially with the new value. float progress = float(now - property.begin) / float(property.end - property.begin); - target = interpolate(target, util::apply_visitor(evaluator, property.value), progress); + target = interpolate(target, mapbox::util::apply_visitor(evaluator, property.value), progress); } else { // Do not apply this property because its transition hasn't begun yet. } |