summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-03-12 17:14:46 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-03-13 10:55:49 -0700
commit998092e5b22813bf8371d3990c718dc00d0da687 (patch)
treeee7acbf2caf5b118641dcdea73a28a8d3c528608 /src
parent762e4bdfbede24ed2acf5f3547d32a0317165495 (diff)
downloadqtlocation-mapboxgl-998092e5b22813bf8371d3990c718dc00d0da687.tar.gz
Remove needless indirection
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/renderer/symbol_bucket.cpp9
-rw-r--r--src/mbgl/renderer/symbol_bucket.hpp4
2 files changed, 1 insertions, 12 deletions
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp
index c755573df9..7e587e7eed 100644
--- a/src/mbgl/renderer/symbol_bucket.cpp
+++ b/src/mbgl/renderer/symbol_bucket.cpp
@@ -42,12 +42,6 @@ bool SymbolBucket::hasTextData() const { return !text.groups.empty(); }
bool SymbolBucket::hasIconData() const { return !icon.groups.empty(); }
-void SymbolBucket::addGlyphsToAtlas(uint64_t tileid, const std::string stackname,
- const std::u32string &text, const FontStack &fontStack,
- GlyphAtlas &glyphAtlas, GlyphPositions &face) {
- glyphAtlas.addGlyphs(tileid, text, stackname, fontStack,face);
-}
-
std::vector<SymbolFeature> SymbolBucket::processFeatures(const GeometryTileLayer& layer,
const FilterExpression& filter,
GlyphStore &glyphStore,
@@ -199,8 +193,7 @@ void SymbolBucket::addFeatures(const GeometryTileLayer& layer,
// Add the glyphs we need for this label to the glyph atlas.
if (shaping.size()) {
- SymbolBucket::addGlyphsToAtlas(id.to_uint64(), layout.text.font, feature.label, fontStack,
- glyphAtlas, face);
+ glyphAtlas.addGlyphs(id.to_uint64(), feature.label, layout.text.font, fontStack, face);
}
}
diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp
index 75f66bff3c..098bee5e0c 100644
--- a/src/mbgl/renderer/symbol_bucket.hpp
+++ b/src/mbgl/renderer/symbol_bucket.hpp
@@ -92,10 +92,6 @@ private:
template <typename Buffer, typename GroupType>
void addSymbols(Buffer &buffer, const PlacedGlyphs &symbols, float scale, PlacementRange placementRange);
- // Adds glyphs to the glyph atlas so that they have a left/top/width/height coordinates associated to them that we can use for writing to a buffer.
- static void addGlyphsToAtlas(uint64_t tileid, const std::string stackname, const std::u32string &string,
- const FontStack &fontStack, GlyphAtlas &glyphAtlas, GlyphPositions &face);
-
public:
const std::unique_ptr<const StyleLayoutSymbol> styleLayout;
bool sdfIcons = false;