diff options
| author | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-06-13 12:55:01 -0700 |
|---|---|---|
| committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-06-19 09:50:08 -0700 |
| commit | 7f36e0cf769f6fe7a759b1cf6c56948c4c141fef (patch) | |
| tree | 2b72187a6306df9d97d4b57007bd64c86a4bf4c7 /platform/ios/src | |
| parent | b7c7d3fdab283d7bf03d8acf68b9cfd478d6973f (diff) | |
| download | qtlocation-mapboxgl-7f36e0cf769f6fe7a759b1cf6c56948c4c141fef.tar.gz | |
[iOS][macOS] Export `MGLImageSource`, add and update documentation. Use animated ImageSource demo in iOS test app
Diffstat (limited to 'platform/ios/src')
| -rw-r--r-- | platform/ios/src/UIImage+MGLAdditions.h | 2 | ||||
| -rw-r--r-- | platform/ios/src/UIImage+MGLAdditions.mm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/ios/src/UIImage+MGLAdditions.h b/platform/ios/src/UIImage+MGLAdditions.h index 671a5ced85..6e15e07cb5 100644 --- a/platform/ios/src/UIImage+MGLAdditions.h +++ b/platform/ios/src/UIImage+MGLAdditions.h @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN - (std::unique_ptr<mbgl::style::Image>)mgl_styleImageWithIdentifier:(NSString *)identifier; -- (mbgl::PremultipliedImage)mgl_PremultipliedImage; +- (mbgl::PremultipliedImage)mgl_premultipliedImage; @end diff --git a/platform/ios/src/UIImage+MGLAdditions.mm b/platform/ios/src/UIImage+MGLAdditions.mm index 029366c01e..5e28d18190 100644 --- a/platform/ios/src/UIImage+MGLAdditions.mm +++ b/platform/ios/src/UIImage+MGLAdditions.mm @@ -25,11 +25,11 @@ - (std::unique_ptr<mbgl::style::Image>)mgl_styleImageWithIdentifier:(NSString *)identifier { BOOL isTemplate = self.renderingMode == UIImageRenderingModeAlwaysTemplate; return std::make_unique<mbgl::style::Image>([identifier UTF8String], - self.mgl_PremultipliedImage, + self.mgl_premultipliedImage, float(self.scale), isTemplate); } --(mbgl::PremultipliedImage)mgl_PremultipliedImage { +-(mbgl::PremultipliedImage)mgl_premultipliedImage { return MGLPremultipliedImageFromCGImage(self.CGImage); } @end |