summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2017-04-20 15:28:28 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-04-20 16:11:57 -0700
commit3c23faf65ade59b62d41b68891bfac238acfc9ea (patch)
treef1251ef31ea888afcf8e521f6d089cacf813ea77 /include
parentc6be40b71b2f81f07e24c14f0b9624b0fcf85798 (diff)
downloadqtlocation-mapboxgl-3c23faf65ade59b62d41b68891bfac238acfc9ea.tar.gz
[core] More complete fix for composite function interpolation edge case
b5b4549 / #8613 handled the edge case for layout properties, but not paint properties. Move the check for a degenerate range to interpolationFactor in order to handle both correctly.
Diffstat (limited to 'include')
-rw-r--r--include/mbgl/style/function/composite_function.hpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/mbgl/style/function/composite_function.hpp b/include/mbgl/style/function/composite_function.hpp
index 2b4ae504ca..9275ccdf8f 100644
--- a/include/mbgl/style/function/composite_function.hpp
+++ b/include/mbgl/style/function/composite_function.hpp
@@ -100,9 +100,6 @@ public:
T evaluate(float zoom, const GeometryTileFeature& feature, T finalDefaultValue) const {
std::tuple<Range<float>, Range<InnerStops>> ranges = coveringRanges(zoom);
Range<T> resultRange = evaluate(std::get<1>(ranges), feature, finalDefaultValue);
- // If the covering stop range is constant, just return the output value directly.
- if (resultRange.min == resultRange.max) return resultRange.min;
- // Otherwise, interpolate between the two stops.
return util::interpolate(
resultRange.min,
resultRange.max,