summaryrefslogtreecommitdiff
path: root/include/mbgl/util/color.hpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-06-16 13:25:06 -0700
committerGitHub <noreply@github.com>2016-06-16 13:25:06 -0700
commit19158d9f01909bf566616524f23e0acb635562f7 (patch)
treea3adf8c8713dbe6d20fe9fae055836e677b4ca47 /include/mbgl/util/color.hpp
parent3f024ebaf02e82e9282e303a46127f366a84904d (diff)
downloadqtlocation-mapboxgl-19158d9f01909bf566616524f23e0acb635562f7.tar.gz
[core, node] Implement setPaintProperty for color properties (#5380)
Diffstat (limited to 'include/mbgl/util/color.hpp')
-rw-r--r--include/mbgl/util/color.hpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/mbgl/util/color.hpp b/include/mbgl/util/color.hpp
index 87d3175178..6491f75801 100644
--- a/include/mbgl/util/color.hpp
+++ b/include/mbgl/util/color.hpp
@@ -1,6 +1,8 @@
#pragma once
-#include <array>
+#include <mbgl/util/optional.hpp>
+
+#include <string>
namespace mbgl {
@@ -14,6 +16,8 @@ public:
static constexpr Color black() { return { 0.0f, 0.0f, 0.0f, 1.0f }; };
static constexpr Color white() { return { 1.0f, 1.0f, 1.0f, 1.0f }; };
+
+ static optional<Color> parse(const std::string&);
};
inline bool operator==(const Color& colorA, const Color& colorB) {