summaryrefslogtreecommitdiff
path: root/include/mbgl
diff options
context:
space:
mode:
Diffstat (limited to 'include/mbgl')
-rw-r--r--include/mbgl/map/view.hpp1
-rw-r--r--include/mbgl/util/color.hpp6
2 files changed, 6 insertions, 1 deletions
diff --git a/include/mbgl/map/view.hpp b/include/mbgl/map/view.hpp
index 9f12ee5fb6..fa6f91d910 100644
--- a/include/mbgl/map/view.hpp
+++ b/include/mbgl/map/view.hpp
@@ -4,6 +4,7 @@
#include <mbgl/util/chrono.hpp>
#include <mbgl/util/image.hpp>
+#include <array>
#include <functional>
#include <memory>
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) {