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

Use std::optional instead of mbgl::optional (#911)

Browse Source
This commit is contained in:
Bart Louwers
2023-03-17 12:51:59 +01:00
committed by GitHub
parent 36846439c6
commit 15ad65dd3d
482 changed files with 2605 additions and 2652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,8 +169,8 @@ void GeometryTileWorker::setLayers(std::vector<Immutable<LayerProperties>> layer
}
void GeometryTileWorker::reset(uint64_t correlationID_) {
layers = nullopt;
data = nullopt;
layers = std::nullopt;
data = std::nullopt;
correlationID = correlationID_;
switch (state) {
@@ -288,7 +288,7 @@ void GeometryTileWorker::onGlyphsAvailable(GlyphMap newGlyphMap) {
GlyphIDs& pendingGlyphIDs = pendingGlyphDependency.second;
for (auto& newGlyph : newGlyphs) {
const GlyphID& glyphID = newGlyph.first;
optional<Immutable<Glyph>>& glyph = newGlyph.second;
std::optional<Immutable<Glyph>>& glyph = newGlyph.second;
if (pendingGlyphIDs.erase(glyphID)) {
glyphs.emplace(glyphID, std::move(glyph));
@@ -450,7 +450,7 @@ void GeometryTileWorker::finalizeLayout() {
}
MBGL_TIMING_START(watch)
optional<AlphaImage> glyphAtlasImage;
std::optional<AlphaImage> glyphAtlasImage;
ImageAtlas iconAtlas = makeImageAtlas(imageMap, patternMap, versionMap);
if (!layouts.empty()) {
GlyphAtlas glyphAtlas = makeGlyphAtlas(glyphMap);