diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-26 15:12:43 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-11-10 11:33:17 -0800 |
| commit | 54e08b1f83504e12cbc19b08295d9f9ed5177ab5 (patch) | |
| tree | 40513395d4d0ed2d9003ef30a708f21b2e83e5ab /src/mbgl/util | |
| parent | a5625675890213f94de7632d4ef152ade627c9a5 (diff) | |
| download | qtlocation-mapboxgl-54e08b1f83504e12cbc19b08295d9f9ed5177ab5.tar.gz | |
[core] Eliminate use of ClassProperties for paint
Diffstat (limited to 'src/mbgl/util')
| -rw-r--r-- | src/mbgl/util/interpolate.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mbgl/util/interpolate.hpp b/src/mbgl/util/interpolate.hpp index 55b1e2add4..28bbde8bf9 100644 --- a/src/mbgl/util/interpolate.hpp +++ b/src/mbgl/util/interpolate.hpp @@ -46,7 +46,8 @@ template<> inline TextJustifyType interpolate(const TextJustifyType a, const Tex template<> inline TextTransformType interpolate(const TextTransformType a, const TextTransformType, const double) { return a; } template<> inline RotationAlignmentType interpolate(const RotationAlignmentType a, const RotationAlignmentType, const double) { return a; } - +template<> inline Faded<std::string> interpolate(const Faded<std::string>, const Faded<std::string> b, const double) { return b; } +template<> inline Faded<std::vector<float>> interpolate(const Faded<std::vector<float>>, const Faded<std::vector<float>> b, const double) { return b; } } } |