summaryrefslogtreecommitdiff
path: root/include/mbgl/style/types.hpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-04-22 10:38:42 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-04-22 15:53:18 -0700
commit5939dd5b412fcc1ef857711a137589aa865bd442 (patch)
tree4bd4e021ea564ee262cff56ab7b6f76e98b29471 /include/mbgl/style/types.hpp
parentd77e35b6866e461c3cb05de2112d548be4ef7780 (diff)
downloadqtlocation-mapboxgl-5939dd5b412fcc1ef857711a137589aa865bd442.tar.gz
[core] Use the proper type for font stacks
Diffstat (limited to 'include/mbgl/style/types.hpp')
-rw-r--r--include/mbgl/style/types.hpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp
index 999b8d8b79..ca56d39991 100644
--- a/include/mbgl/style/types.hpp
+++ b/include/mbgl/style/types.hpp
@@ -5,12 +5,21 @@
#include <string>
#include <array>
+#include <vector>
namespace mbgl {
// Stores a premultiplied color, with all four channels ranging from 0..1
-typedef std::array<float, 4> Color;
+using Color = std::array<float, 4>;
+// An array of font names
+using FontStack = std::vector<std::string>;
+
+std::string fontStackToString(const FontStack&);
+
+struct FontStackHash {
+ std::size_t operator()(const FontStack&) const;
+};
template <typename T>
struct Faded {