tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Rewrite parsePropertyTransition to work around GCC 4.9 bug

Browse Source
This commit is contained in:
John Firebaugh
2016-04-26 11:27:59 -07:00
parent 878310b891
commit 189b5c2f60
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/mbgl/style/property_parsing.cpp
View File

@@ -262,22 +262,25 @@ optional<std::vector<std::string>> parseConstant(const char* name, const JSValue
}
optional<PropertyTransition> parsePropertyTransition(const char *, const JSValue& value) {
PropertyTransition transition;
if (value.IsObject()) {
bool parsed = false;
if (value.HasMember("duration") && value["duration"].IsNumber()) {
transition.duration.emplace(Milliseconds(value["duration"].GetUint()));
parsed = true;
}
if (value.HasMember("delay") && value["delay"].IsNumber()) {
transition.delay.emplace(Milliseconds(value["delay"].GetUint()));
parsed = true;
}
if (!parsed) {
return {};
}
if (!value.IsObject()) {
return {};
}
return transition;
optional<Duration> duration;
if (value.HasMember("duration") && value["duration"].IsNumber()) {
duration.emplace(Milliseconds(value["duration"].GetUint()));
}
optional<Duration> delay;
if (value.HasMember("delay") && value["delay"].IsNumber()) {
delay.emplace(Milliseconds(value["delay"].GetUint()));
}
if (!duration && !delay) {
return {};
}
return PropertyTransition(duration, delay);
}
} // namespace mbgl