diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-09-16 14:48:46 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-09-24 16:14:09 +0200 |
commit | 6c526e56370a0f4dee9a4b6ed45489fcb14e3ff1 (patch) | |
tree | c4af9112bcd5e5670054d1374b67b3857f93d432 /src/map/tile_parser.cpp | |
parent | d9fc7708a2dfb6e2506a5d10d896a813557c056d (diff) | |
download | qtlocation-mapboxgl-6c526e56370a0f4dee9a4b6ed45489fcb14e3ff1.tar.gz |
make sure all of our async handles are stopped before stopping the map thread
Diffstat (limited to 'src/map/tile_parser.cpp')
-rw-r--r-- | src/map/tile_parser.cpp | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/src/map/tile_parser.cpp b/src/map/tile_parser.cpp index 6923c1a422..8fbcfa45d7 100644 --- a/src/map/tile_parser.cpp +++ b/src/map/tile_parser.cpp @@ -38,19 +38,26 @@ namespace mbgl { TileParser::~TileParser() = default; TileParser::TileParser(const std::string &data, VectorTileData &tile, - const std::shared_ptr<const Style> &style, - const std::shared_ptr<GlyphAtlas> &glyphAtlas, - const std::shared_ptr<GlyphStore> &glyphStore, - const std::shared_ptr<SpriteAtlas> &spriteAtlas, - const std::shared_ptr<Sprite> &sprite) + const std::shared_ptr<const Style> &style_, + const std::shared_ptr<GlyphAtlas> &glyphAtlas_, + const std::shared_ptr<GlyphStore> &glyphStore_, + const std::shared_ptr<SpriteAtlas> &spriteAtlas_, + const std::shared_ptr<Sprite> &sprite_) : vector_data(pbf((const uint8_t *)data.data(), data.size())), tile(tile), - style(style), - glyphAtlas(glyphAtlas), - glyphStore(glyphStore), - spriteAtlas(spriteAtlas), - sprite(sprite), + style(style_), + glyphAtlas(glyphAtlas_), + glyphStore(glyphStore_), + spriteAtlas(spriteAtlas_), + sprite(sprite_), collision(std::make_unique<Collision>(tile.id.z, 4096, tile.source.tile_size, tile.depth)) { + assert(&tile != nullptr); + assert(style); + assert(glyphAtlas); + assert(glyphStore); + assert(spriteAtlas); + assert(sprite); + assert(collision); } void TileParser::parse() { |