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

Reserve vector storage in the convert filter code

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2018-10-10 13:55:21 +03:00
parent 442e3f350f
commit bf785f57e6
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mbgl/style/conversion/filter.cpp
View File

@@ -118,7 +118,8 @@ ParseResult convertLiteral(const Convertible& convertible, Error& error) {
optional<std::vector<std::unique_ptr<Expression>>> convertLiteralArray(const Convertible &input, Error& error, std::size_t startIndex = 0) {
std::vector<std::unique_ptr<Expression>> output;
for (std::size_t i = startIndex; i < arrayLength(input); i++) {
output.reserve(arrayLength(input));
for (std::size_t i = startIndex; i < arrayLength(input); ++i) {
ParseResult literal = convertLiteral(arrayMember(input, i), error);
if (!literal) {
return nullopt;
@@ -178,7 +179,8 @@ ParseResult convertLegacyInFilter(const Convertible& values, Error& error) {
optional<std::vector<std::unique_ptr<Expression>>> convertLegacyFilterArray(const Convertible &input, Error& error, std::size_t startIndex = 0) {
std::vector<std::unique_ptr<Expression>> output;
for (std::size_t i = startIndex; i < arrayLength(input); i++) {
output.reserve(arrayLength(input));
for (std::size_t i = startIndex; i < arrayLength(input); ++i) {
optional<std::unique_ptr<Expression>> child = convertLegacyFilter(arrayMember(input, i), error);
if (!child) {
return nullopt;
@@ -225,7 +227,8 @@ optional<mbgl::Value> serializeLegacyFilter(const Convertible& values) {
return nullopt;
} else if (isArray(values)) {
std::vector<mbgl::Value> result;
for (std::size_t i = 0; i < arrayLength(values); i++) {
result.reserve(arrayLength(values));
for (std::size_t i = 0; i < arrayLength(values); ++i) {
auto arrayValue = serializeLegacyFilter(arrayMember(values, i));
if (arrayValue) {
result.push_back(*arrayValue);

2
src/mbgl/style/conversion/function.cpp
View File

@@ -78,7 +78,7 @@ optional<PropertyExpression<T>> convertFunctionToExpression(const Convertible& v
return nullopt;
}
optional<T> defaultValue;
optional<T> defaultValue{};
auto defaultValueValue = objectMember(value, "default");
if (defaultValueValue) {