diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-21 14:52:19 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-24 15:52:28 -0700 |
| commit | 5dd98df50ba1210b1eef0d8d6655713a725f2995 (patch) | |
| tree | b289bb3cbad5d1c3076816f4891a057d6089fc93 /test/text | |
| parent | 6f708ac5458fe332e25ca398431928b7ff5ba404 (diff) | |
| download | qtlocation-mapboxgl-5dd98df50ba1210b1eef0d8d6655713a725f2995.tar.gz | |
[all] Rationalize style::Image
A style has a collection of images, just as it has collections of sources and layers.
* Name things appropriately
* Use std::unique_ptr
Diffstat (limited to 'test/text')
| -rw-r--r-- | test/text/quads.test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/text/quads.test.cpp b/test/text/quads.test.cpp index 91f2ea7af8..83fd249535 100644 --- a/test/text/quads.test.cpp +++ b/test/text/quads.test.cpp @@ -14,7 +14,7 @@ TEST(getIconQuads, normal) { Anchor anchor(2.0, 3.0, 0.0, 0.5f, 0); SpriteAtlasElement image = { Rect<uint16_t>( 0, 0, 15, 11 ), - std::make_shared<const SpriteImage>(PremultipliedImage({1,1}), 1.0), + style::Image(PremultipliedImage({1,1}), 1.0), { 0, 0 }, 1.0f }; @@ -47,7 +47,7 @@ TEST(getIconQuads, style) { Anchor anchor(0.0, 0.0, 0.0, 0.5f, 0); SpriteAtlasElement image = { Rect<uint16_t>( 0, 0, 20, 20 ), - std::make_shared<const SpriteImage>(PremultipliedImage({1,1}), 1.0), + style::Image(PremultipliedImage({1,1}), 1.0), { 0, 0 }, 1.0f }; |