diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2018-01-08 12:30:15 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-01-09 16:46:52 -0800 |
commit | e887cda986218ae84317b3ecb5ba81d9b9bb776f (patch) | |
tree | 810e31367ba53e8bf0f54600cce662f383005199 /src/mbgl/style/expression/compound_expression.cpp | |
parent | a4ab4f68e2d2b927dea139b1945f8810ab215a9e (diff) | |
download | qtlocation-mapboxgl-e887cda986218ae84317b3ecb5ba81d9b9bb776f.tar.gz |
[core] Fix alpha handling in rgba and to-rgba operators
Diffstat (limited to 'src/mbgl/style/expression/compound_expression.cpp')
-rw-r--r-- | src/mbgl/style/expression/compound_expression.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mbgl/style/expression/compound_expression.cpp b/src/mbgl/style/expression/compound_expression.cpp index ff21157faa..42cb655024 100644 --- a/src/mbgl/style/expression/compound_expression.cpp +++ b/src/mbgl/style/expression/compound_expression.cpp @@ -210,7 +210,12 @@ std::unordered_map<std::string, CompoundExpressionRegistry::Definition> initiali ); }); define("to-rgba", [](const Color& color) -> Result<std::array<double, 4>> { - return std::array<double, 4> {{ color.r, color.g, color.b, color.a }}; + return std::array<double, 4> {{ + 255 * color.r / color.a, + 255 * color.g / color.a, + 255 * color.b / color.a, + color.a + }}; }); define("rgba", rgba); |