diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-22 10:38:42 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-22 15:53:18 -0700 |
| commit | 5939dd5b412fcc1ef857711a137589aa865bd442 (patch) | |
| tree | 4bd4e021ea564ee262cff56ab7b6f76e98b29471 /src/mbgl/util/interpolate.hpp | |
| parent | d77e35b6866e461c3cb05de2112d548be4ef7780 (diff) | |
| download | qtlocation-mapboxgl-5939dd5b412fcc1ef857711a137589aa865bd442.tar.gz | |
[core] Use the proper type for font stacks
Diffstat (limited to 'src/mbgl/util/interpolate.hpp')
| -rw-r--r-- | src/mbgl/util/interpolate.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mbgl/util/interpolate.hpp b/src/mbgl/util/interpolate.hpp index 7d1a857e8e..f456a0ecb1 100644 --- a/src/mbgl/util/interpolate.hpp +++ b/src/mbgl/util/interpolate.hpp @@ -35,6 +35,7 @@ inline std::array<T, 2> interpolate(const std::array<T, 2>& a, const std::array< // fake interpolations that just return the first value template<> inline bool interpolate(const bool a, const bool, const double) { return a; } template<> inline std::vector<float> interpolate(const std::vector<float> a, const std::vector<float>, const double) { return a; } +template<> inline std::vector<std::string> interpolate(const std::vector<std::string> a, const std::vector<std::string>, const double) { return a; } template<> inline std::string interpolate(const std::string a, const std::string, const double) { return a; } template<> inline TranslateAnchorType interpolate(const TranslateAnchorType a, const TranslateAnchorType, const double) { return a; } template<> inline RotateAnchorType interpolate(const RotateAnchorType a, const RotateAnchorType, const double) { return a; } |