diff options
author | Ansis Brammanis <brammanis@gmail.com> | 2015-02-04 15:30:51 -0800 |
---|---|---|
committer | Ansis Brammanis <brammanis@gmail.com> | 2015-02-04 18:46:47 -0800 |
commit | f07de8dd23779319909f20f9da384eaf46aa4ca3 (patch) | |
tree | 0d17118533e81bb8443b09e691c541e69733ac1d /src/mbgl/style/piecewisefunction_properties.cpp | |
parent | a49737e542dc518076add81fca7d02c0a9449ae7 (diff) | |
download | qtlocation-mapboxgl-f07de8dd23779319909f20f9da384eaf46aa4ca3.tar.gz |
make pattern and dasharray properties use duration
from "*-transition" properties
Diffstat (limited to 'src/mbgl/style/piecewisefunction_properties.cpp')
-rw-r--r-- | src/mbgl/style/piecewisefunction_properties.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/style/piecewisefunction_properties.cpp b/src/mbgl/style/piecewisefunction_properties.cpp index 86d02e7b12..72ed0b8f73 100644 --- a/src/mbgl/style/piecewisefunction_properties.cpp +++ b/src/mbgl/style/piecewisefunction_properties.cpp @@ -6,7 +6,7 @@ namespace mbgl { template <typename T> -uint32_t getBiggestStopLessThan(std::vector<std::pair<float, T>> stops, float z) { +size_t getBiggestStopLessThan(std::vector<std::pair<float, T>> stops, float z) { for (uint32_t i = 0; i < stops.size(); i++) { if (stops[i].first > z) { return i == 0 ? i : i - 1; @@ -23,7 +23,7 @@ T PiecewiseConstantFunction<T>::evaluate(float z, const ZoomHistory &zh) const { float t = std::min((std::chrono::steady_clock::now() - zh.lastIntegerZoomTime) / duration, 1.0f); float fromScale = 1.0f; float toScale = 1.0f; - uint32_t from, to; + size_t from, to; if (z > zh.lastIntegerZoom) { result.t = fraction + (1.0f - fraction) * t; |