Fix color.rs.cpp impl, add test

maplibre · Jan 15, 2025 · 014f2ba · 014f2ba
1 parent 038fa16
commit 014f2ba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/mbgl/util/color.cpp b/src/mbgl/util/color.cpp
@@ -6,7 +6,7 @@
 namespace mbgl {
 
 std::optional<Color> Color::parse(const std::string& s) {
-    auto css_color = CSSColorParser::parse(s);
+    const auto css_color = CSSColorParser::parse(s);
 
     // Premultiply the color.
     if (css_color) {

diff --git a/src/mbgl/util/color.rs.cpp b/src/mbgl/util/color.rs.cpp
@@ -10,9 +10,10 @@
 namespace mbgl {
 
 std::optional<Color> Color::parse(const std::string& s) {
-    auto css_color = rustutils::parse_css_color(s);
+    const auto css_color = rustutils::parse_css_color(s);
     if (css_color.success) {
-        return {{css_color.r, css_color.g, css_color.b, css_color.a}};
+        const float factor = css_color.a / 255;
+        return {{css_color.r * factor, css_color.g * factor, css_color.b * factor, css_color.a}};
     } else {
         return {};
     }

diff --git a/test/util/color.test.cpp b/test/util/color.test.cpp
@@ -25,6 +25,7 @@ const std::map<std::string, std::optional<Color>> testCases = {
     {"#123", Color(0.067f, 0.133f, 0.2f, 1.0f)},             // Short hex format
     {"rgb(-10, 0, 0)", Color(0.0f, 0.0f, 0.0f, 1.0f)},       // Clamped to 0
     {"rgba(300, 0, 0, 1.0)", Color(1.0f, 0.0f, 0.0f, 1.0f)}, // Clamped to 1
+    {"rgba(100,100,100,0.2)", Color(20.0f / 255, 20.0f / 255, 20.0f / 255, 0.2f)},
     // {"#GGGGGG", Color(0.0f, 0.0f, 0.0f, 1.0f)}, // Treated as fallback black
     // not supported right now
     // {"#0F0F", Color(0.0f, 1.0f, 0.0f, 1.0f)},