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 /platform/macos/src/NSImage+MGLAdditions.h | |
| 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 'platform/macos/src/NSImage+MGLAdditions.h')
| -rw-r--r-- | platform/macos/src/NSImage+MGLAdditions.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/macos/src/NSImage+MGLAdditions.h b/platform/macos/src/NSImage+MGLAdditions.h index c6a80e372d..d3cc80615b 100644 --- a/platform/macos/src/NSImage+MGLAdditions.h +++ b/platform/macos/src/NSImage+MGLAdditions.h @@ -1,6 +1,6 @@ #import <Cocoa/Cocoa.h> -#include <mbgl/sprite/sprite_image.hpp> +#include <mbgl/style/image.hpp> NS_ASSUME_NONNULL_BEGIN @@ -8,9 +8,9 @@ NS_ASSUME_NONNULL_BEGIN - (nullable instancetype)initWithMGLPremultipliedImage:(mbgl::PremultipliedImage&&)image; -- (nullable instancetype)initWithMGLSpriteImage:(const mbgl::SpriteImage *)spriteImage; +- (nullable instancetype)initWithMGLStyleImage:(const mbgl::style::Image *)image; -- (std::unique_ptr<mbgl::SpriteImage>)mgl_spriteImage; +- (std::unique_ptr<mbgl::style::Image>)mgl_styleImage; @end |