diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2018-03-30 03:21:44 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2018-03-30 15:36:32 -0700 |
| commit | d066e94103e7e21dbd795a986659fc729aa53a4e (patch) | |
| tree | 7819e62d61cb093a20dee2aa510a921f3887bf21 /src/mbgl/style/expression/value.cpp | |
| parent | f4d9fb816d4a22bcc17a07452a926f4f06e75d3b (diff) | |
| download | qtlocation-mapboxgl-d066e94103e7e21dbd795a986659fc729aa53a4e.tar.gz | |
[core] Fixed to-rgba with zero opacity
Diffstat (limited to 'src/mbgl/style/expression/value.cpp')
| -rw-r--r-- | src/mbgl/style/expression/value.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mbgl/style/expression/value.cpp b/src/mbgl/style/expression/value.cpp index 72779d4956..1b3257c755 100644 --- a/src/mbgl/style/expression/value.cpp +++ b/src/mbgl/style/expression/value.cpp @@ -106,12 +106,13 @@ Value ValueConverter<mbgl::Value>::toExpressionValue(const mbgl::Value& value) { mbgl::Value ValueConverter<mbgl::Value>::fromExpressionValue(const Value& value) { return value.match( [&](const Color& color)->mbgl::Value { + std::array<double, 4> array = color.toArray(); return std::vector<mbgl::Value>{ std::string("rgba"), - double(255 * color.r / color.a), - double(255 * color.g / color.a), - double(255 * color.b / color.a), - double(color.a) + array[0], + array[1], + array[2], + array[3], }; }, [&](const std::vector<Value>& values)->mbgl::Value { |