Merge branch 'release-ios-v3.4.0' into 1ec5-release-ios-v3.4.0-beta.5-master

Also reran make style-code and manually discarded anything related to fill extrusion layers.

1 files changed, 16 insertions, 1 deletions

diff --git a/platform/ios/src/UIImage+MGLAdditions.mm b/platform/ios/src/UIImage+MGLAdditions.mm
index 215b23faff..7b5737f5e4 100644
--- a/platform/ios/src/UIImage+MGLAdditions.mm
+++ b/platform/ios/src/UIImage+MGLAdditions.mm
@@ -2,6 +2,20 @@
 
 @implementation UIImage (MGLAdditions)
 
+- (nullable instancetype)initWithMGLSpriteImage:(const mbgl::SpriteImage *)spriteImage
+{
+    std::string png = encodePNG(spriteImage->image);
+    NSData *data = [[NSData alloc] initWithBytes:png.data() length:png.size()];
+    if (self = [self initWithData:data scale:spriteImage->pixelRatio])
+    {
+        if (spriteImage->sdf)
+        {
+            self = [self imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        }
+    }
+    return self;
+}
+
 - (std::unique_ptr<mbgl::SpriteImage>)mgl_spriteImage
 {
     CGImageRef cgImage = self.CGImage;
@@ -21,7 +35,8 @@
     CGContextRelease(context);
     CGColorSpaceRelease(colorSpace);
 
-    return std::make_unique<mbgl::SpriteImage>(std::move(cPremultipliedImage), float(self.scale));
+    BOOL isTemplate = self.renderingMode == UIImageRenderingModeAlwaysTemplate;
+    return std::make_unique<mbgl::SpriteImage>(std::move(cPremultipliedImage), float(self.scale), isTemplate);
 }
 
 @end