[ios, macos] Fixed color conversion on Sierraupstream/1ec5-mbgl-expression-json-foundation-11254

1 files changed, 10 insertions, 7 deletions

diff --git a/platform/macos/src/NSColor+MGLAdditions.mm b/platform/macos/src/NSColor+MGLAdditions.mm
index 6244ee396f..8c9086ccf7 100644
--- a/platform/macos/src/NSColor+MGLAdditions.mm
+++ b/platform/macos/src/NSColor+MGLAdditions.mm
@@ -82,15 +82,18 @@
     // Alpha
     components.back() *= 255.0;
     
-    // The Mapbox Style Specification does not specify a color space, but it is
-    // assumed to be sRGB for consistency with CSS.
-    NSColor *color = [NSColor colorWithColorSpace:[NSColorSpace sRGBColorSpace]
-                                       components:&components[0]
-                                            count:components.size()];
+    // macOS 10.12 Sierra and below uses calibrated RGB by default.
     if ([NSColor redColor].colorSpaceName == NSCalibratedRGBColorSpace) {
-        color = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+        return [NSColor colorWithCalibratedRed:components[0]
+                                         green:components[1]
+                                          blue:components[2]
+                                         alpha:components[3]];
     }
-    return color;
+    // The Mapbox Style Specification does not specify a color space, but it is
+    // assumed to be sRGB for consistency with CSS.
+    return [NSColor colorWithColorSpace:[NSColorSpace sRGBColorSpace]
+                             components:&components[0]
+                                  count:components.size()];
 }
 
 @end