summaryrefslogtreecommitdiff
path: root/test/style
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2015-12-15 16:06:34 -0800
committerBruno de Oliveira Abinader <bruno@mapbox.com>2015-12-17 16:53:37 -0800
commit93725e062a3f506fc829c9da4649c9ce032b4067 (patch)
tree9fbe1a9019f360da3c1a4f3afa0434e4ed5722e3 /test/style
parent5a63ce557629eee8436b004d6940d52e758949d4 (diff)
downloadqtlocation-mapboxgl-93725e062a3f506fc829c9da4649c9ce032b4067.tar.gz
[core] Load sources only if there is at least one visible layer
Diffstat (limited to 'test/style')
-rw-r--r--test/style/pending_resources.cpp2
-rw-r--r--test/style/resource_loading.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/test/style/pending_resources.cpp b/test/style/pending_resources.cpp
index 7f665e85e2..e87de1a31b 100644
--- a/test/style/pending_resources.cpp
+++ b/test/style/pending_resources.cpp
@@ -39,7 +39,7 @@ TEST_P(PendingResources, DeleteMapObjectWithPendingRequest) {
const std::string style = util::read_file("test/fixtures/resources/style.json");
map->setStyleJSON(style, ".");
- map->renderStill([&endTest](std::exception_ptr, PremultipliedImage&&) {
+ map->renderStill([](std::exception_ptr, PremultipliedImage&&) {
EXPECT_TRUE(false) << "Should never happen.";
});
diff --git a/test/style/resource_loading.cpp b/test/style/resource_loading.cpp
index c646f0372a..ba6a138b5d 100644
--- a/test/style/resource_loading.cpp
+++ b/test/style/resource_loading.cpp
@@ -51,6 +51,8 @@ public:
data_.setAnimationTime(now);
transform_.updateTransitions(now);
+ style_->cascade();
+ style_->recalculate(16);
style_->update(transform_.getState(), texturePool_);
}