diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-11-24 10:07:18 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-11-25 15:57:36 -0800 |
| commit | 0c1e378bc9555f6cf826bb38b1a36fa742f8ce9b (patch) | |
| tree | 9aec8e4f475ff715645072503b3e0ec78f0573af /test/style | |
| parent | 2de0a351a0635192bd05116cebdf0103c2638d05 (diff) | |
| download | qtlocation-mapboxgl-0c1e378bc9555f6cf826bb38b1a36fa742f8ce9b.tar.gz | |
[core] Rewrite image handling
* Consolidate Image and StillImage
* Typecheck unassociated vs premultiplied images
* Rewrite default platform image decoding implementation
Diffstat (limited to 'test/style')
| -rw-r--r-- | test/style/pending_resources.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/style/pending_resources.cpp b/test/style/pending_resources.cpp index 3ba59657de..58dc72937e 100644 --- a/test/style/pending_resources.cpp +++ b/test/style/pending_resources.cpp @@ -3,7 +3,6 @@ #include "../fixtures/util.hpp" #include <mbgl/map/map.hpp> -#include <mbgl/map/still_image.hpp> #include <mbgl/platform/default/headless_display.hpp> #include <mbgl/platform/default/headless_view.hpp> #include <mbgl/util/io.hpp> @@ -40,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, std::unique_ptr<const StillImage>) { + map->renderStill([&endTest](std::exception_ptr, UnassociatedImage&&) { EXPECT_TRUE(false) << "Should never happen."; }); |