summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun Van Nuland <tobrun.van.nuland@gmail.com>2017-08-23 18:35:34 +0200
committerTobrun Van Nuland <tobrun.van.nuland@gmail.com>2017-08-23 18:35:34 +0200
commit8ee9aeb0dcf6ddc271bfee705f239aded31e54bf (patch)
tree1868e22c4642ee0bebff50fc1f49f4a660ee0b53
parentf2c9f2bf3695fc30579a40978ebda9d87e4b4bcd (diff)
downloadqtlocation-mapboxgl-upstream/tvn-test-ci-tests.tar.gz
Revert "[core] Ensure image dependencies in GeometryTileWorker::onImagesAvailable"upstream/tvn-test-ci-tests
This reverts commit cd8eb13ba2d8b65f6cac12a36e0586abc56fcb9f.
-rw-r--r--src/mbgl/tile/geometry_tile_worker.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mbgl/tile/geometry_tile_worker.cpp b/src/mbgl/tile/geometry_tile_worker.cpp
index add1ea343c..c622d82e31 100644
--- a/src/mbgl/tile/geometry_tile_worker.cpp
+++ b/src/mbgl/tile/geometry_tile_worker.cpp
@@ -218,12 +218,7 @@ void GeometryTileWorker::onGlyphsAvailable(GlyphMap newGlyphMap) {
void GeometryTileWorker::onImagesAvailable(ImageMap newImageMap) {
imageMap = std::move(newImageMap);
- for (const auto& pair : imageMap) {
- auto it = pendingImageDependencies.find(pair.first);
- if (it != pendingImageDependencies.end()) {
- pendingImageDependencies.erase(it);
- }
- }
+ pendingImageDependencies.clear();
symbolDependenciesChanged();
}