diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2017-04-20 12:28:35 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2017-04-24 10:42:47 +0200 |
commit | 59055cf403cab60496fcc8e7cbf06874fa55bb8b (patch) | |
tree | 7e74c6ba3fa9c2cc1930811302e8b93b48ab1687 /test/sprite/sprite_atlas.test.cpp | |
parent | 197f0ca6b418a27412bfcc7e891ab80949fd8833 (diff) | |
download | qtlocation-mapboxgl-59055cf403cab60496fcc8e7cbf06874fa55bb8b.tar.gz |
[core] Move Sprite parsing to thread pool
Diffstat (limited to 'test/sprite/sprite_atlas.test.cpp')
-rw-r--r-- | test/sprite/sprite_atlas.test.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/sprite/sprite_atlas.test.cpp b/test/sprite/sprite_atlas.test.cpp index 2335165715..fc0219efb9 100644 --- a/test/sprite/sprite_atlas.test.cpp +++ b/test/sprite/sprite_atlas.test.cpp @@ -9,6 +9,7 @@ #include <mbgl/util/io.hpp> #include <mbgl/util/image.hpp> #include <mbgl/util/run_loop.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/util/string.hpp> #include <utility> @@ -22,7 +23,7 @@ TEST(SpriteAtlas, Basic) { util::read_file("test/fixtures/annotations/emerald.json")); SpriteAtlas atlas({ 63, 112 }, 1); - atlas.setSprites(spriteParseResult.get<Sprites>()); + atlas.setSprites(spriteParseResult); EXPECT_EQ(1.0f, atlas.getPixelRatio()); EXPECT_EQ(63u, atlas.getSize().width); @@ -77,7 +78,7 @@ TEST(SpriteAtlas, Size) { util::read_file("test/fixtures/annotations/emerald.json")); SpriteAtlas atlas({ 63, 112 }, 1.4); - atlas.setSprites(spriteParseResult.get<Sprites>()); + atlas.setSprites(spriteParseResult); EXPECT_DOUBLE_EQ(1.4f, atlas.getPixelRatio()); EXPECT_EQ(63u, atlas.getSize().width); @@ -270,6 +271,7 @@ public: util::RunLoop loop; StubFileSource fileSource; StubStyleObserver observer; + ThreadPool threadPool { 1 }; SpriteAtlas spriteAtlas{ { 32, 32 }, 1 }; void run() { @@ -277,7 +279,7 @@ public: Log::setObserver(std::make_unique<Log::NullObserver>()); spriteAtlas.setObserver(&observer); - spriteAtlas.load("test/fixtures/resources/sprite", fileSource); + spriteAtlas.load("test/fixtures/resources/sprite", threadPool, fileSource); loop.run(); } |