From e887cda986218ae84317b3ecb5ba81d9b9bb776f Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 8 Jan 2018 12:30:15 -0800
Subject: [core] Fix alpha handling in rgba and to-rgba operators

---
 src/mbgl/style/expression/compound_expression.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/mbgl/style/expression/compound_expression.cpp')

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);
-- 
cgit v1.2.1