[ios, macos] Fixed color conversion on Sierra

mapbox · Mar 30, 2018 · 99d02d4 · 99d02d4
1 parent 087cf7a
commit 99d02d4
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/platform/macos/src/NSColor+MGLAdditions.mm b/platform/macos/src/NSColor+MGLAdditions.mm
@@ -82,15 +82,18 @@ + (NSColor *)mgl_colorWithComponentExpressions:(NSArray<NSExpression *> *)compon
     // 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