This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
Round-trip linear interpolators (release-boba) #11565
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1ec5
force-pushed
the
1ec5-interpolate-linear-11562-boba
branch
from
c9f1400 to
e29f8c1
Compare
|
This test is failing because mapbox/mapbox-gl-js@34902f8 includes mapbox/mapbox-gl-js#6388, which hasn’t been ported to gl-native yet: [
- "to-rgba",
+ "literal",
[
- "rgba",
+ null,
null,
null,
0,
- 0,
0,
0
]
]f([{},{}])
Expected: [0,0,0,0]
Actual: [null,null,null,0]f([{},{}])
Expected: [0,0,0,0]
Actual: [null,null,null,0]
* failed to-rgba zeroThe division by zero is easy to address, but the test still fails because the /cc @jfirebaugh |
5 tasks
|
da95eca6356ec90260d7ac4205a06d04f9959c3d ports mapbox/mapbox-gl-js#6388 and depends on mapbox/mapbox-gl-js#6427, which corrects the relevant test fixture. |
anandthakker
approved these changes
Mar 30, 2018
src/mbgl/style/expression/value.cpp
Outdated
| @@ -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 { | |||
| auto array = color.toArray(); | |||
There was a problem hiding this comment.
s/auto/std::array<double, 4>/
src/mbgl/util/color.cpp
Outdated
| @@ -23,11 +23,25 @@ optional<Color> Color::parse(const std::string& s) { | |||
| } | |||
|
|
|||
| std::string Color::stringify() const { | |||
| auto array = toArray(); | |||
There was a problem hiding this comment.
s/auto/std::array<double, 4>/
src/mbgl/util/color.cpp
Outdated
|
|
||
| std::array<double, 4> Color::toArray() const { | ||
| if (a == 0) { | ||
| return {{}}; |
There was a problem hiding this comment.
I'd vote for explicitly listing 0, 0, 0, 0 here
1ec5
force-pushed
the
1ec5-interpolate-linear-11562-boba
branch
from
da95eca to
a88ed20
Compare
|
Fixed (and squashed into two separate commits). |
1ec5
force-pushed
the
1ec5-interpolate-linear-11562-boba
branch
from
a88ed20 to
d066e94
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #11564 and mapbox/mapbox-gl-js#6388 to the release-boba branch.
Unblocks #11389. Depends on mapbox/mapbox-gl-js#6427.
/cc @ChrisLoer @anandthakker