diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-19 15:30:19 +0200 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-19 17:16:54 +0200 |
| commit | 8ac87ec5cb2374d212a31942ca19ce395704eb69 (patch) | |
| tree | 9ec08c29e1a4f5e779f9c69ba7d96411f1c64f1d /src/mbgl/style/parser.cpp | |
| parent | 9592e61288d071a7927c7cf99e7e5f3f97711642 (diff) | |
| download | qtlocation-mapboxgl-8ac87ec5cb2374d212a31942ca19ce395704eb69.tar.gz | |
Refactor util::fontStacks()
So that it does not downcast `Layer::Impl` instances.
Also, an unneeded `std::vector` construction was removed from
`Parser::fontStacks()`.
Diffstat (limited to 'src/mbgl/style/parser.cpp')
| -rw-r--r-- | src/mbgl/style/parser.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp index 77cf23bad0..ae298bd915 100644 --- a/src/mbgl/style/parser.cpp +++ b/src/mbgl/style/parser.cpp @@ -267,14 +267,13 @@ void Parser::parseLayer(const std::string& id, const JSValue& value, std::unique } } -std::vector<FontStack> Parser::fontStacks() const { +std::set<FontStack> Parser::fontStacks() const { std::vector<Immutable<Layer::Impl>> impls; impls.reserve(layers.size()); for (const auto& layer : layers) { impls.emplace_back(layer->baseImpl); } - std::set<FontStack> result = mbgl::fontStacks(impls); - return std::vector<FontStack>(result.begin(), result.end()); + return mbgl::fontStacks(impls); } } // namespace style |