summaryrefslogtreecommitdiff
path: root/src/mbgl/util/color.cpp
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2018-03-30 03:21:44 -0700
committerMinh Nguyễn <mxn@1ec5.org>2018-03-30 15:36:32 -0700
commitd066e94103e7e21dbd795a986659fc729aa53a4e (patch)
tree7819e62d61cb093a20dee2aa510a921f3887bf21 /src/mbgl/util/color.cpp
parentf4d9fb816d4a22bcc17a07452a926f4f06e75d3b (diff)
downloadqtlocation-mapboxgl-d066e94103e7e21dbd795a986659fc729aa53a4e.tar.gz
[core] Fixed to-rgba with zero opacity
Diffstat (limited to 'src/mbgl/util/color.cpp')
-rw-r--r--src/mbgl/util/color.cpp22
1 files changed, 18 insertions, 4 deletions
diff --git a/src/mbgl/util/color.cpp b/src/mbgl/util/color.cpp
index c8145d36e7..55f1b65436 100644
--- a/src/mbgl/util/color.cpp
+++ b/src/mbgl/util/color.cpp
@@ -23,11 +23,25 @@ optional<Color> Color::parse(const std::string& s) {
}
std::string Color::stringify() const {
+ std::array<double, 4> array = toArray();
return "rgba(" +
- util::toString(r * 255 / a) + "," +
- util::toString(g * 255 / a) + "," +
- util::toString(b * 255 / a) + "," +
- util::toString(a) + ")";
+ util::toString(array[0]) + "," +
+ util::toString(array[1]) + "," +
+ util::toString(array[2]) + "," +
+ util::toString(array[3]) + ")";
+}
+
+std::array<double, 4> Color::toArray() const {
+ if (a == 0) {
+ return {{ 0, 0, 0, 0 }};
+ } else {
+ return {{
+ r * 255 / a,
+ g * 255 / a,
+ b * 255 / a,
+ a,
+ }};
+ }
}
} // namespace mbgl