diff options
author | Nadia Barbosa <nadiabarbosa@me.com> | 2019-04-11 17:00:10 -0700 |
---|---|---|
committer | Nadia Barbosa <captainbarbosa@users.noreply.github.com> | 2019-04-12 11:07:46 -0700 |
commit | 2ee967a036d115d35aa474c0c84a645ab7097c72 (patch) | |
tree | 0cb339193abb65c8016d5c29d7812fa95ca4634e /platform/darwin/test/MGLExpressionTests.mm | |
parent | 19c6010ff29eba791be76e26dbbeb9c3c325827a (diff) | |
download | qtlocation-mapboxgl-2ee967a036d115d35aa474c0c84a645ab7097c72.tar.gz |
[ios, macos] Premultiply color values for mgl_color
Fixes https://github.com/mapbox/mapbox-gl-native/issues/14329
Diffstat (limited to 'platform/darwin/test/MGLExpressionTests.mm')
-rw-r--r-- | platform/darwin/test/MGLExpressionTests.mm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/platform/darwin/test/MGLExpressionTests.mm b/platform/darwin/test/MGLExpressionTests.mm index 06f06d8c6e..e7d1608018 100644 --- a/platform/darwin/test/MGLExpressionTests.mm +++ b/platform/darwin/test/MGLExpressionTests.mm @@ -282,9 +282,14 @@ using namespace std::string_literals; XCTAssertEqualObjects([expression expressionValueWithObject:nil context:nil], color); } { - MGLColor *color = [MGLColor mgl_colorWithColor:{ 255.0/255, 239.0/255, 213.0/255, 0.5 }]; // papayawhip + // Transform color components to non-premultiplied values + float alpha = 0.5; + float red = (255.0 * alpha) / 255; + float green = (239.0 * alpha) / 255; + float blue = (213.0 * alpha) / 255; + MGLColor *color = [MGLColor mgl_colorWithColor:{ red, green, blue, alpha }]; // papayawhip NSExpression *expression = [NSExpression expressionForConstantValue:color]; - NSArray *jsonExpression = @[@"rgba", @255, @239, @213, @0.5]; + NSArray *jsonExpression = @[@"rgba", @127.5, @119.5, @106.5, @0.5]; XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression); XCTAssertEqualObjects([expression expressionValueWithObject:nil context:nil], color); } |