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

[core] Replace GlyphRangeSet in onGlyphsAvailable with optionals in the map

Browse Source 
GlyphRangeSet isn't keyed by FontStack, so using it to indicate that a particular range was loaded could have produced false positives.
This commit is contained in:
John Firebaugh
2017-04-06 09:20:07 -07:00
parent 09a2271576
commit a50d7a331b
10 changed files with 56 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/mbgl/tile/geometry_tile_worker.cpp
View File

@@ -196,30 +196,21 @@ void GeometryTileWorker::coalesce() {
self.invoke(&GeometryTileWorker::coalesced);
}
void GeometryTileWorker::onGlyphsAvailable(GlyphPositionMap newGlyphPositions) {
for (auto& newFontGlyphs : newGlyphPositions) {
const FontStack& fontStack = newFontGlyphs.first;
GlyphPositions& newPositions = newFontGlyphs.second;
void GeometryTileWorker::onGlyphsAvailable(GlyphPositionMap newGlyphPositions, GlyphRangeSet loadedRanges) {
GlyphDependencies loadedGlyphs;
for (auto& pendingFontGlyphs : pendingGlyphDependencies) {
auto newFontGlyphs = newGlyphPositions.find(pendingFontGlyphs.first);
for (auto glyphID : pendingFontGlyphs.second) {
if (newFontGlyphs != newGlyphPositions.end()) {
auto newFontGlyph = newFontGlyphs->second.find(glyphID);
if (newFontGlyph != newFontGlyphs->second.end()) {
glyphPositions[pendingFontGlyphs.first].emplace(glyphID, newFontGlyph->second);
}
GlyphPositions& positions = glyphPositions[fontStack];
GlyphIDs& pendingGlyphIDs = pendingGlyphDependencies[fontStack];
for (auto& newPosition : newPositions) {
const GlyphID& glyphID = newPosition.first;
optional<Glyph>& glyph = newPosition.second;
if (pendingGlyphIDs.erase(glyphID)) {
positions.emplace(glyphID, std::move(glyph));
}
if (loadedRanges.find(getGlyphRange(glyphID)) != loadedRanges.end()) {
// Erase the glyph from our pending font set as long as its range is loaded
// If the glyph itself is missing, that means we can't get a glyph for
// this fontstack, and we go ahead and render with missing glyphs
loadedGlyphs[pendingFontGlyphs.first].insert(glyphID);
}
}
}
for (auto& loadedFont : loadedGlyphs) {
for (auto loadedGlyph : loadedFont.second) {
pendingGlyphDependencies[loadedFont.first].erase(loadedGlyph);
}
}
symbolDependenciesChanged();